[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4052/8267] kernel-fitimage.bbclass: Allow unset load/entry addresses for ramdisks

[Emmanuele Bassi <ebassi src gnome org>]

commit 492ee05c657790c9a1961d6727d7f6205f5c03af
Author: Nathan Rossi <nathan nathanrossi com>
Date:   Fri Oct 21 22:07:27 2016 +1000

    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)
    
    Signed-off-by: Nathan Rossi <nathan nathanrossi com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-fitimage.bbclass |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 2934b3a..706beed 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -178,6 +178,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} {
@@ -187,8 +196,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}";
                         };