Skip to content

Commit ebf4157

Browse files
committed
configs: new defconfig for rpi4 bootloader
This commit migrates the bootloader build from Raspberry Pi 4 board package to a dedicated bootloader defconfig. The idea is to set up dedicated wokflows for building bootloaders, which change rarely, streamlining the Infix image builds. A dedicated workflow, or job in an existing workflow, can then do the composition to minimal SD-card images useful for starting up Infix on boards where SD-card is the primary boot source. Signed-off-by: Joachim Wiberg <[email protected]>
1 parent 2f296e9 commit ebf4157

File tree

2 files changed

+39
-27
lines changed

2 files changed

+39
-27
lines changed

configs/rpi4_boot_defconfig

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
BR2_aarch64=y
2+
BR2_cortex_a72=y
3+
BR2_TOOLCHAIN_EXTERNAL=y
4+
BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
5+
BR2_DL_DIR="$(BR2_EXTERNAL_INFIX_PATH)/dl"
6+
BR2_CCACHE=y
7+
BR2_CCACHE_DIR="$(BR2_EXTERNAL_INFIX_PATH)/.ccache"
8+
BR2_ENABLE_DEBUG=y
9+
BR2_PACKAGE_OVERRIDE_FILE="$(BR2_EXTERNAL_INFIX_PATH)/local.mk"
10+
BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches"
11+
BR2_SSP_NONE=y
12+
BR2_INIT_NONE=y
13+
BR2_SYSTEM_BIN_SH_NONE=y
14+
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
15+
# BR2_PACKAGE_BUSYBOX is not set
16+
BR2_PACKAGE_RPI_FIRMWARE=y
17+
BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/config.txt"
18+
BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/cmdline.txt"
19+
# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
20+
# BR2_TARGET_ROOTFS_TAR is not set
21+
BR2_TARGET_UBOOT=y
22+
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
23+
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
24+
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01"
25+
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_arm64"
26+
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="${BR2_EXTERNAL_INFIX_PATH}/board/common/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/extras.config"
27+
BR2_TARGET_UBOOT_NEEDS_DTC=y
28+
BR2_TARGET_UBOOT_FORMAT_DTB=y
29+
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
30+
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="arch/arm/dts/infix-key.dtbo arch/arm/dts/rpi-env.dtbo"
31+
BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/rpi-env.dtso"
32+
BR2_PACKAGE_HOST_GENIMAGE=y
33+
BR2_PACKAGE_HOST_RAUC=y
34+
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
35+
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
36+
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
37+
TRUSTED_KEYS=y
38+
TRUSTED_KEYS_DEVELOPMENT=y
39+
# GNS3_APPLIANCE is not set

package/board/raspberry-pi-4/Config.in

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,6 @@ config BR2_PACKAGE_RASPBERRY_PI_4
99
select BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
1010
select BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X
1111
select SDCARD_AUX
12-
select BR2_TARGET_UBOOT
13-
select BR2_TARGET_UBOOT_FORMAT_CUSTOM
14-
select BR2_TARGET_UBOOT_NEEDS_DTC
1512
select BR2_TARGET_UBOOT_NEEDS_UBOOT_TOOLS
16-
select BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
1713
help
1814
Raspberry pi 4
19-
20-
# Don't redefine - just set conditional defaults
21-
if BR2_PACKAGE_RASPBERRY_PI_4
22-
23-
config BR2_TARGET_UBOOT_BOARD_DEFCONFIG
24-
default "rpi_arm64"
25-
26-
config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES
27-
default "${BR2_EXTERNAL_INFIX_PATH}/board/common/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/extras.config"
28-
29-
config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
30-
default "arch/arm/dts/infix-key.dtbo arch/arm/dts/rpi-env.dtbo"
31-
32-
config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
33-
default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/rpi-env.dtso"
34-
35-
config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE
36-
default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/config.txt"
37-
38-
config BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE
39-
default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/cmdline.txt"
40-
41-
endif

0 commit comments

Comments
 (0)