more to add

diff --git a/README b/README
index 52c06ce4e4cb4a005ba1df2f2648950cae8cc537..8f4e23fda4e25e5989fb46b5784202b3349156e4 100644 (file)
--- a/README
+++ b/README
@@ -24,3 +24,5 @@ find . | cpio --quiet -H newc -o | pigz > /boot/initrd.gz
 
 cp /boot/efi/EFI/BOOT/BOOTAA64.EFI efi/boot/
 cp /boot/vmlinuz-5.16.0-asahi-next-20220118-14779-ga4d177b3ad21-dirty vmlinuz
 
 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/m1-config-options b/m1-config-options
index 2878fc03f0b1cde872e63fb8e8a850b13f2fb46b..47c57b6d0d1b6d83fb623e0397646d914ec61ff2 100644 (file)
--- a/m1-config-options
+++ b/m1-config-options
@@ -22,3 +22,8 @@ CONFIG_SND_SIMPLE_CARD=y
 CONFIG_SND_SOC_CS42L42=y
 CONFIG_FW_LOADER_USER_HELPER_FALLBACK=n
 CONFIG_FW_LOADER_USER_HELPER=n
 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