manual merge

diff --git a/README b/README
index b1a4cf4afc332c867212512c89a17e3f614f0479..86e81cedb78b436437f4ddff3aec9164463cd89b 100644 (file)
--- a/README
+++ b/README
@@ -25,3 +25,8 @@ ln -s lib/systemd/systemd init
 find . | cpio --quiet -H newc -o | pigz > /boot/initrd.gz
 
 > etc/motd
+
+cp /boot/efi/EFI/BOOT/BOOTAA64.EFI efi/boot/
+cp /boot/vmlinuz-5.16.0-asahi-next-20220118-14779-ga4d177b3ad21-dirty vmlinuz
+
+./scripts/kconfig/merge_config.sh .config .config-fragment

diff --git a/bootstrap.sh b/bootstrap.sh
index 1b335bf4b7794239743585e592bd07682270e194..0117678f7b53a9f21106f639340d2a4535e388b4 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,7 +28,12 @@ cat m1n1/build/m1n1.macho `find u-boot -name \*.dtb` u-boot/u-boot-nodtb.bin > u
 git clone https://github.com/AsahiLinux/linux
 cd linux
 git checkout origin/asahi
-curl https://tg.st/u/c5eb67144c10f8685ebd8c1dfef8586588e1994d.patch | patch -p1
-curl https://tg.st/u/asahi-config-2022-01-08 > .config
+# SPI patches
+curl https://tg.st/u/aa6a11b3feeda0f57284f99406188e4615e7c43c.patch | patch -p1
+curl https://tg.st/u/9ce9060dea91951a330feeeda3ad636bc88c642c.patch | patch -p1
+# Sound patch
+curl https://tg.st/u/5nly | patch -p1
+# Config with sound enabled
+curl https://tg.st/u/asahi-config-2022-01-19 > .config
 make olddefconfig
 make bindeb-pkg

diff --git a/m1-config-options b/m1-config-options
new file mode 100644 (file)
index 0000000..47c57b6
--- /dev/null
+++ b/m1-config-options
@@ -0,0 +1,29 @@
+CONFIG_ARCH_APPLE=y
+CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
+CONFIG_PCIE_APPLE=y
+CONFIG_NVME_APPLE=y
+CONFIG_I2C_APPLE=y
+CONFIG_SPI_APPLE=y
+CONFIG_PINCTRL_APPLE_GPIO=y
+CONFIG_APPLE_WATCHDOG=y
+CONFIG_SND_SOC_APPLE_MCA=y
+CONFIG_HID_APPLE=y
+CONFIG_SPI_HID_APPLE_OF=y
+CONFIG_SPI_HID_APPLE_CORE=y
+CONFIG_APPLE_ADMAC=y
+CONFIG_COMMON_CLK_APPLE_NCO=y
+CONFIG_APPLE_MAILBOX=y
+CONFIG_APPLE_DART=y
+CONFIG_APPLE_PMGR_PWRSTATE=y
+CONFIG_APPLE_RTKIT=y
+CONFIG_APPLE_SART=y
+CONFIG_APPLE_AIC=y
+CONFIG_SND_SIMPLE_CARD=y
+CONFIG_SND_SOC_CS42L42=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=n
+CONFIG_FW_LOADER_USER_HELPER=n
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_PCI=y
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_DRM_SIMPLEDRM=y