From 7e5a83ba2837cc9f31e56d9af8938c9145e5ae27 Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Fri, 29 Aug 2025 20:27:55 -0500
Subject: [PATCH] configs/*: Move GRUB, kernel config to external.mk

The fewer required items in each defconfig file, the easier they will be
to maintain.
---
 configs/aimeeos_qemu_aarch64_defconfig |  2 --
 configs/aimeeos_rpi3_defconfig         |  2 --
 external.mk                            | 28 +++++++++++++++++++++++++-
 kernel/config                          |  2 --
 4 files changed, 27 insertions(+), 7 deletions(-)
 delete mode 100644 kernel/config

diff --git a/configs/aimeeos_qemu_aarch64_defconfig b/configs/aimeeos_qemu_aarch64_defconfig
index 29c8a3a..166cf7d 100644
--- a/configs/aimeeos_qemu_aarch64_defconfig
+++ b/configs/aimeeos_qemu_aarch64_defconfig
@@ -7,10 +7,8 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_AIMEEOS_PATH)/board/qemu/post-image
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_AIMEEOS_PATH)/kernel/config"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 # BR2_PACKAGE_BUSYBOX is not set
 # BR2_TARGET_ROOTFS_TAR is not set
 AIMEEOS=y
 AIMEEOS_DEFAULT_ROOTFLAGS="systemd.mask=serial-getty@ttyAMA0 systemd.debug_shell systemd.default_debug_tty=ttyAMA0"
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot configfile echo efi_gop fat gzio linux loadenv minicmd normal part_gpt probe regexp squash4 terminfo test zstd"
diff --git a/configs/aimeeos_rpi3_defconfig b/configs/aimeeos_rpi3_defconfig
index 6adaad1..9a82cc4 100644
--- a/configs/aimeeos_rpi3_defconfig
+++ b/configs/aimeeos_rpi3_defconfig
@@ -10,7 +10,6 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,ac69f097e1fba94502cbd36278db204120a37943)/linux-ac69f097e1fba94502cbd36278db204120a37943.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_AIMEEOS_PATH)/kernel/config"
 BR2_LINUX_KERNEL_ZSTD=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3"
@@ -23,7 +22,6 @@ BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI=y
 BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="$(BR2_EXTERNAL_AIMEEOS_PATH)/board/raspberrypi3/cmdline.txt"
 BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="$(BR2_EXTERNAL_AIMEEOS_PATH)/board/raspberrypi3/config.txt"
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI="boot configfile echo efi_gop fat gzio linux loadenv minicmd normal part_gpt probe regexp squash4 terminfo test zstd"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b"
 BR2_PACKAGE_HOST_KMOD_XZ=y
 AIMEEOS=y
diff --git a/external.mk b/external.mk
index f33020b..cc4edfd 100644
--- a/external.mk
+++ b/external.mk
@@ -1,5 +1,7 @@
 ifeq ($(AIMEEOS),y)
 
+BR2_TOOLCHAIN_BUILDROOT_VENDOR = "aimeeos"
+
 # Disable the default fstab
 SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW =
 # Disable the default var.mount
@@ -7,14 +9,38 @@ SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS =
 
 # Enable required kernel options for Aimee OS storage
 define AIMEEOS_LINUX_CONFIG_FIXUPS
-$(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS)
 $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD)
+$(call KCONFIG_ENABLE_OPT,CONFIG_BTRFS_FS)
+$(call KCONFIG_ENABLE_OPT,CONFIG_EFI)
+$(call KCONFIG_ENABLE_OPT,CONFIG_SQUASHFS)
 endef
 LINUX_KCONFIG_FIXUP_CMDS += $(AIMEEOS_LINUX_CONFIG_FIXUPS)
 
 # Generate the initramfs image after building the target
 BR2_ROOTFS_POST_BUILD_SCRIPT += $(BR2_EXTERNAL_AIMEEOS_PATH)/boot/mkinitramfs.sh
 
+# Ensure the requisite GRUB2 modules are selected
+define AIMEEOS_GRUB2_MODULES
+boot
+configfile
+echo
+efi_gop
+fat
+gzio
+linux
+loadenv
+minicmd
+normal
+part_gpt
+probe
+regexp
+squash4
+terminfo
+test
+zstd
+endef
+BR2_TARGET_GRUB2_BUILTIN_MODULES_EFI += $(AIMEEOS_GRUB2_MODULES)
+
 # Overwrite the grub.cfg provided by Buildroot with our own.
 define AIMEEOS_GRUB2_INSTALL_IMAGES_CMDS
 $(foreach tuple, $(GRUB2_TUPLES-y), \
diff --git a/kernel/config b/kernel/config
deleted file mode 100644
index 559ac12..0000000
--- a/kernel/config
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_EFI=y
-CONFIG_SQUASHFS=y