Skip to contentSkip to conversation

u-boot: fix build for rk3308

PATCH New Trevor Woerner 1 participant 1 message Jan 17, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: fix build for rk3308

In upstream mainline U-Boot commit 9e13fef00b8d ("rockchip: Kconfig: Enable external TPL binary for rk3308") U-Boot was changed to incorporate the DDR TPL using the same mechanism as the RK3568 and RK3588 platforms.

---
 recipes-bsp/u-boot/u-boot%.bbappend | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
recipes-bsp/u-boot/u-boot%.bbappend +4 -6
index d902c9a05a83..3e59e46c646f 100644
@@ -4,7 +4,10 @@ DEPENDS:append:rock-pi-s = " u-boot-tools-native"
 DEPENDS:append:rock-pi-4 = " gnutls-native"
 
 EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf"
-EXTRA_OEMAKE:append:rk3308 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf"
+EXTRA_OEMAKE:append:rk3308 = " \
+	BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf \
+	ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin \
+	"
 EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf"
 EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf"
 EXTRA_OEMAKE:append:rk3588s = " \
@@ -26,8 +29,3 @@ do_compile:append:rock2-square () {
 		cp ${B}/spl/${SPL_BINARY} ${B}
 	fi
 }
-
-do_compile:append:rk3308() {
-	mkimage -n rk3308 -T rksd -d ${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin ${B}/idbloader.img
-	cat ${B}/spl/u-boot-spl.bin >> ${B}/idbloader.img
-}
Signature · 1 line
2.43.0.76.g1a87c842ece3