On Sat, Jun 16, 2018 at 12:28 PM Alex Kiernan <alex.kier...@gmail.com> wrote: > > Introduce UBOOT_DTB_LOADADDRESS and UBOOT_DTBO_LOADADDRESS so that you > can set where U-Boot loads full and overlay DTBs. This is required when > using bootm's overlay support to construct the final DTB. > > Signed-off-by: Alex Kiernan <alex.kier...@gmail.com> > --- > This commit conflicts with this patch: > > https://patchwork.openembedded.org/series/12589/ > > Either that needs applying first and this needs rebasing on top of it, or > use this one in its place. > > Changes in v2: None
Hi Alex, I see these 2 patches are merged into master. Can you send them to be integrated in 'rocko' branch also? Thanks, Mihai > > meta/classes/kernel-fitimage.bbclass | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/meta/classes/kernel-fitimage.bbclass > b/meta/classes/kernel-fitimage.bbclass > index 50a91e1..f3c2ff0 100644 > --- a/meta/classes/kernel-fitimage.bbclass > +++ b/meta/classes/kernel-fitimage.bbclass > @@ -135,6 +135,15 @@ fitimage_emit_section_dtb() { > > dtb_csum="sha1" > > + dtb_loadline="" > + dtb_ext=${DTB##*.} > + if [ "${dtb_ext}" = "dtbo" ]; then > + if [ -n "${UBOOT_DTBO_LOADADDRESS}" ]; then > + dtb_loadline="load = <${UBOOT_DTBO_LOADADDRESS}>;" > + fi > + elif [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then > + dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;" > + fi > cat << EOF >> ${1} > fdt@${2} { > description = "Flattened Device Tree blob"; > @@ -142,6 +151,7 @@ fitimage_emit_section_dtb() { > type = "flat_dt"; > arch = "${UBOOT_ARCH}"; > compression = "none"; > + ${dtb_loadline} > hash@1 { > algo = "${dtb_csum}"; > }; > -- > 2.7.4 > -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core