diff --git a/configs/rpi4_boot_defconfig b/configs/rpi4_boot_defconfig
new file mode 100644
index 00000000..b9d8a817
--- /dev/null
+++ b/configs/rpi4_boot_defconfig
@@ -0,0 +1,39 @@
+BR2_aarch64=y
+BR2_cortex_a72=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y
+BR2_DL_DIR="$(BR2_EXTERNAL_INFIX_PATH)/dl"
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(BR2_EXTERNAL_INFIX_PATH)/.ccache"
+BR2_ENABLE_DEBUG=y
+BR2_PACKAGE_OVERRIDE_FILE="$(BR2_EXTERNAL_INFIX_PATH)/local.mk"
+BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches"
+BR2_SSP_NONE=y
+BR2_INIT_NONE=y
+BR2_SYSTEM_BIN_SH_NONE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
+# BR2_PACKAGE_BUSYBOX is not set
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/config.txt"
+BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/cmdline.txt"
+# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_arm64"
+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"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_DTB=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="arch/arm/dts/infix-key.dtbo arch/arm/dts/rpi-env.dtbo"
+BR2_TARGET_UBOOT_CUSTOM_DTS_PATH="${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/rpi-env.dtso"
+BR2_PACKAGE_HOST_GENIMAGE=y
+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
+TRUSTED_KEYS=y
+TRUSTED_KEYS_DEVELOPMENT=y
+# GNS3_APPLIANCE is not set
diff --git a/package/board/raspberry-pi-4/Config.in b/package/board/raspberry-pi-4/Config.in
index bd6562a2..8fd09de8 100644
--- a/package/board/raspberry-pi-4/Config.in
+++ b/package/board/raspberry-pi-4/Config.in
@@ -9,33 +9,6 @@ config BR2_PACKAGE_RASPBERRY_PI_4
 	select BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4
 	select BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X
 	select SDCARD_AUX
-	select BR2_TARGET_UBOOT
-	select BR2_TARGET_UBOOT_FORMAT_CUSTOM
-	select BR2_TARGET_UBOOT_NEEDS_DTC
 	select BR2_TARGET_UBOOT_NEEDS_UBOOT_TOOLS
-	select BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
 	help
 	  Raspberry pi 4
-
-# Don't redefine - just set conditional defaults
-if BR2_PACKAGE_RASPBERRY_PI_4
-
-config BR2_TARGET_UBOOT_BOARD_DEFCONFIG
-	default "rpi_arm64"
-
-config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES
-	default "${BR2_EXTERNAL_INFIX_PATH}/board/common/uboot/extras.config ${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/extras.config"
-
-config BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME
-	default "arch/arm/dts/infix-key.dtbo arch/arm/dts/rpi-env.dtbo"
-
-config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
-	default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/uboot/rpi-env.dtso"
-
-config BR2_PACKAGE_RPI_FIRMWARE_CONFIG_FILE
-	default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/config.txt"
-
-config BR2_PACKAGE_RPI_FIRMWARE_CMDLINE_FILE
-	default "${BR2_EXTERNAL_INFIX_PATH}/src/board/raspberry-pi-4/cmdline.txt"
-
-endif