MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-19 12:49:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rk3288 bootloader

Browse Source 
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>
This commit is contained in:
Joshua Watt 2019-12-03 21:30:34 -06:00 committed by Trevor Woerner
parent 59408a8b23
commit 295b58facf
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/rockchip-gpt-img.bbclass
View File

@ -135,9 +135,7 @@ EOF
generate_rk3288_loader1_image () { generate_rk3288_loader1_image () {
# Burn bootloader dd if=${DEPLOY_DIR_IMAGE}/idbloader.img-${MACHINE} of=${GPTIMG} conv=notrunc,fsync seek=64
mkimage -n rk3288 -T rksd -d ${DEPLOY_DIR_IMAGE}/${SPL_BINARY} ${WORKDIR}/${UBOOT} dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin of=${GPTIMG} conv=notrunc,fsync seek=16384
cat ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin >> ${WORKDIR}/${UBOOT}
dd if=${WORKDIR}/${UBOOT} of=${GPTIMG} conv=notrunc,fsync seek=64
} }

2
conf/machine/include/rk3288.inc
View File

@ -10,7 +10,7 @@ require conf/machine/include/rockchip-defaults.inc
SERIAL_CONSOLES = "115200;ttyS2" SERIAL_CONSOLES = "115200;ttyS2"
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
SPL_BINARY ?= "u-boot-spl-dtb.bin" SPL_BINARY ?= "idbloader.img"
IMAGE_FSTYPES = "rockchip-gpt-img" IMAGE_FSTYPES = "rockchip-gpt-img"
IMAGE_CLASSES += "rockchip-gpt-img" IMAGE_CLASSES += "rockchip-gpt-img"

8
recipes-bsp/u-boot/u-boot_%.bbappend
View File

@ -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
}