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.
Signed-off-by: Nathan Rossi <[email protected]> --- meta/classes/kernel-fitimage.bbclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 3bbf91f65a..5c9e76b9ac 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}"; }; -- 2.9.3 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
