configs: update dependencies for fireant and disable CONFIG_MMC_PCI

troglobit · troglobit · commit eefe84fd4bf1 · 2025-08-12T10:46:35.000+02:00
The board/common/uboot/extras.config was updated with CONFIG_MMC_PCI
*after* we last built the SparX5i bootloader, and this was really only
needed for the Qemu build, so let's move the requirement there.

Also, we now (Buildroot 2025.02) need to update the dependencies for the
Fireant bootloader with libbsd (for some reason) and dtc, of course.

Signed-off-by: Joachim Wiberg &lt;troglobit@gmail.com&gt;
diff --git a/board/aarch64/qemu/uboot/extras.config b/board/aarch64/qemu/uboot/extras.config
@@ -0,0 +1,3 @@
+# QEMU-specific U-Boot config
+# Enable PCI MMC for QEMU virtualized environment
+CONFIG_MMC_PCI=y
diff --git a/board/common/uboot/extras.config b/board/common/uboot/extras.config
@@ -20,7 +20,6 @@ CONFIG_CMD_SETEXPR_FMT=y
 
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_PCI=y
 CONFIG_CMD_MMC=y
 
 CONFIG_FS_SQUASHFS=y
diff --git a/configs/aarch64_qemu_boot_defconfig b/configs/aarch64_qemu_boot_defconfig
@@ -20,7 +20,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07.02"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="qemu_arm64"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/extras.config"
+BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/extras.config $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/qemu/uboot/extras.config"
 BR2_TARGET_UBOOT_FORMAT_DTB=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
diff --git a/configs/fireant_boot_defconfig b/configs/fireant_boot_defconfig
@@ -11,6 +11,7 @@ BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches"
 BR2_INIT_NONE=y
 BR2_SYSTEM_BIN_SH_NONE=y
 # BR2_PACKAGE_BUSYBOX is not set
+BR2_PACKAGE_LIBBSD=y
 # BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
@@ -20,4 +21,5 @@ BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/kernelkit/u-boot.git"
 BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="c3d9cdcc7d9e3eb490d4036f5eece3fb91a2485c"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mscc_fireant_pcb135_emmc"
 BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_INFIX_PATH)/board/common/uboot/extras.config"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 # GNS3_APPLIANCE is not set

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# QEMU-specific U-Boot config`
	`2`	`+# Enable PCI MMC for QEMU virtualized environment`
	`3`	`+CONFIG_MMC_PCI=y`