aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-12-03 21:30:34 -0600
committerTrevor Woerner <twoerner@gmail.com>2019-12-09 21:32:23 -0500
commit295b58facfb37b84b1e2d871dd4822d8c171dbbd (patch)
treef23de747153ddc3aa0721cc4c4fc8a7db55fe7bf
parent59408a8b23b2ce4289ef62fd31857c3e29a21886 (diff)
downloadmeta-rockchip-295b58facfb37b84b1e2d871dd4822d8c171dbbd.tar.gz
meta-rockchip-295b58facfb37b84b1e2d871dd4822d8c171dbbd.tar.bz2
meta-rockchip-295b58facfb37b84b1e2d871dd4822d8c171dbbd.zip
Fix rk3288 bootloader
Recent versions of u-boot use a combined SPL/TPL (called idbloader.img) in the loader1 partition, which then loads the full u-boot from the loader2 partition. Update the GPT partition class to reflect this change. Additionally, remove the u-boot bbappend since it is no longer needed. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r--classes/rockchip-gpt-img.bbclass6
-rw-r--r--conf/machine/include/rk3288.inc2
-rw-r--r--recipes-bsp/u-boot/u-boot_%.bbappend8
3 files changed, 3 insertions, 13 deletions
diff --git a/classes/rockchip-gpt-img.bbclass b/classes/rockchip-gpt-img.bbclass
index 5e545bf..f40cf36 100644
--- a/classes/rockchip-gpt-img.bbclass
+++ b/classes/rockchip-gpt-img.bbclass
@@ -135,9 +135,7 @@ EOF
generate_rk3288_loader1_image () {
- # Burn bootloader
- mkimage -n rk3288 -T rksd -d ${DEPLOY_DIR_IMAGE}/${SPL_BINARY} ${WORKDIR}/${UBOOT}
- cat ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin >> ${WORKDIR}/${UBOOT}
- dd if=${WORKDIR}/${UBOOT} of=${GPTIMG} conv=notrunc,fsync seek=64
+ dd if=${DEPLOY_DIR_IMAGE}/idbloader.img-${MACHINE} of=${GPTIMG} conv=notrunc,fsync seek=64
+ dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin of=${GPTIMG} conv=notrunc,fsync seek=16384
}
diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index 0528e8a..08cb561 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -10,7 +10,7 @@ require conf/machine/include/rockchip-defaults.inc
SERIAL_CONSOLES = "115200;ttyS2"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-SPL_BINARY ?= "u-boot-spl-dtb.bin"
+SPL_BINARY ?= "idbloader.img"
IMAGE_FSTYPES = "rockchip-gpt-img"
IMAGE_CLASSES += "rockchip-gpt-img"
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
deleted file mode 100644
index b9ee8af..0000000
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-do_compile_append_rk3288 () {
- # copy to default search path
- if [ ${SPL_BINARY} ]; then
- cp ${B}/spl/${SPL_BINARY} ${B}/
- fi
-}