defconfig: Fix boot defconfigs post post-post-image

wkz · wkz · commit db5309cb405c · 2025-12-04T09:35:59.000+01:00
After merging post-post-image, TRUSTED_KEYS must be set in order for
the keys to be injected into the U-Boot DTB, so we need to explicitly
enable it for all boards that use the generic secure boot scripts.
diff --git a/configs/bpi_r3_emmc_boot_defconfig b/configs/bpi_r3_emmc_boot_defconfig
@@ -39,6 +39,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
-DISK_IMAGE_BOOT_BIN=y
-DISK_IMAGE_BOOT_DATA="${BINARIES_DIR}/flash-image.bin"
-DISK_IMAGE_BOOT_OFFSET=0x00200000
diff --git a/configs/bpi_r3_sd_boot_defconfig b/configs/bpi_r3_sd_boot_defconfig
@@ -39,6 +39,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 TRUSTED_KEYS=y
 TRUSTED_KEYS_DEVELOPMENT=y
-DISK_IMAGE_BOOT_BIN=y
-DISK_IMAGE_BOOT_DATA="${BINARIES_DIR}/flash-image.bin"
-DISK_IMAGE_BOOT_OFFSET=0x00200000
diff --git a/configs/cn9130_crb_boot_defconfig b/configs/cn9130_crb_boot_defconfig
@@ -37,4 +37,5 @@ BR2_PACKAGE_HOST_RAUC=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
-# GNS3_APPLIANCE is not set
+TRUSTED_KEYS=y
+TRUSTED_KEYS_DEVELOPMENT=y
diff --git a/configs/fireant_boot_defconfig b/configs/fireant_boot_defconfig
@@ -22,4 +22,4 @@ 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
+
diff --git a/configs/rpi2_boot_defconfig b/configs/rpi2_boot_defconfig
@@ -31,4 +31,3 @@ BR2_TARGET_BAREBOX_IMAGE_FILE="images/barebox-raspberry-pi-2.img"
 BR2_PACKAGE_HOST_BMAP_TOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_RAUC=y
-# GNS3_APPLIANCE is not set
diff --git a/configs/rpi64_boot_defconfig b/configs/rpi64_boot_defconfig
@@ -39,4 +39,5 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
 BR2_PACKAGE_BOOTLOADER_SPLASHSCREEN=y
-# GNS3_APPLIANCE is not set
+TRUSTED_KEYS=y
+TRUSTED_KEYS_DEVELOPMENT=y
