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

rock2-square: reinstate non-idbloader u-boot

Browse Source 
Unfortunately, although the rock2-square is an rk3288-based device, its U-Boot
has not been updated to use the TPL+SPL/idbloader mechanism. This commit adds
back the previous U-Boot packaging but only for the rock2-square.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
This commit is contained in:
Trevor Woerner 2019-12-10 12:49:15 -05:00
parent 85f1ba657f
commit 6732e8b981
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \
virtual/bootloader:do_deploy" virtual/bootloader:do_deploy"
PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image"
PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image"
IMAGE_CMD_rockchip-gpt-img () { IMAGE_CMD_rockchip-gpt-img () {
# Change to image directory # Change to image directory
@ -139,3 +140,10 @@ generate_rk3288_loader1_image () {
dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin of=${GPTIMG} conv=notrunc,fsync seek=16384 dd if=${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.bin of=${GPTIMG} conv=notrunc,fsync seek=16384
} }
generate_rock2_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
}

1
conf/machine/rock2-square.conf
View File

@ -8,5 +8,6 @@
require conf/machine/include/rk3288.inc require conf/machine/include/rk3288.inc
SPL_BINARY = "u-boot-spl-dtb.bin"
KERNEL_DEVICETREE = "rk3288-rock2-square.dtb" KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
UBOOT_MACHINE = "rock2_defconfig" UBOOT_MACHINE = "rock2_defconfig"

6
recipes-bsp/u-boot/u-boot%.bbappend Normal file
View File

@ -0,0 +1,6 @@
do_compile_append_rock2-square () {
# copy to default search path
if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then
cp ${B}/spl/${SPL_BINARY} ${B}
fi
}