From b4a4dc0de8b301a2970d8ad2f79297becec7816e Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Fri, 21 Oct 2016 22:07:27 +1000 Subject: kernel-fitimage.bbclass: Allow unset load/entry addresses for ramdisks Allow the load and entry addresses to remain unset if the UBOOT_RD_* variables are also unset for ramdisk entries in the image tree. This allows for U-Boot to decide dynamically where to load the ramdisk. (From OE-Core rev: 941b6ce3b297ed83f1c05dd76bfeefbf93482e6f) Change-Id: I2c9fc1044080148bd6d4e955e732eced87855b5e Signed-off-by: Nathan Rossi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Rick Altherr (cherry picked from commit 492ee05c657790c9a1961d6727d7f6205f5c03af) --- .../yocto-poky/meta/classes/kernel-fitimage.bbclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'import-layers/yocto-poky/meta') diff --git a/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass b/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass index 95a134437f..3d1f85588e 100644 --- a/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass +++ b/import-layers/yocto-poky/meta/classes/kernel-fitimage.bbclass @@ -140,6 +140,15 @@ EOF fitimage_emit_section_ramdisk() { ramdisk_csum="sha1" + ramdisk_loadline="" + ramdisk_entryline="" + + if [ -n "${UBOOT_RD_LOADADDRESS}" ]; then + ramdisk_loadline="load = <${UBOOT_RD_LOADADDRESS}>;" + fi + if [ -n "${UBOOT_RD_ENTRYPOINT}" ]; then + ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;" + fi cat << EOF >> ${1} ramdisk@${2} { @@ -149,8 +158,8 @@ fitimage_emit_section_ramdisk() { arch = "${UBOOT_ARCH}"; os = "linux"; compression = "none"; - load = <${UBOOT_RD_LOADADDRESS}>; - entry = <${UBOOT_RD_ENTRYPOINT}>; + ${ramdisk_loadline} + ${ramdisk_entryline} hash@1 { algo = "${ramdisk_csum}"; }; -- cgit v1.2.3