On 11 January 2018 at 20:24, Franz Forstmayr <[email protected]> wrote: > Replaced the hard-coded devicetree files in IMAGE_BOOT_FILES with a function, > which formats the KERNEL_DEVICETREE list properly. > > Signed-off-by: Franz Forstmayr <[email protected]> > --- > meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 8 ++++++++ > meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +- > meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 +- > meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +- > meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 +- > meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 2 +- > 6 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc > b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc > index 77fbec8..6db6504 100644 > --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc > +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc > @@ -34,6 +34,14 @@ XSERVER ?= " \ > ${XSERVER_EXT} \ > " > > +def get_dtb_list(d): > + if d.getVar("KERNEL_DEVICETREE", True): > + dtbs = d.getVar("KERNEL_DEVICETREE", True).split(" ") > + dtbs = [os.path.basename(d) for d in dtbs] > + if len(dtbs) != 0: > + return " ".join([d.getVar("KERNEL_IMAGETYPE", True) + "-" + dtb > for dtb in dtbs])
Could you change the use of "d.getVar(..., True)" to just "d.getVar(...)". I know the code I pointed you at has the ", True" however newer versions (2.3+?) of bitbake and oe-core have this as default (aka expand = True). At some point the existing code will need to be cleaned up in the same way. With the above changed you can add my reviewed by. Reviewed-by: Nathan Rossi <[email protected]> And if Manju has no issues with it, should be good to apply. Regards, Nathan > + return "" > + > XSERVER_EXT ?= "" > XSERVER_EXT_zynqmp ?= "xf86-video-armsoc" > > diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf > b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf > index 57877bf..07eb3d3 100644 > --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf > +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf > @@ -29,7 +29,7 @@ SERIAL_CONSOLE = "115200 ttyPS0" > > KERNEL_DEVICETREE = "zynq-zc702.dtb" > > -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zc702.dtb" > +IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}" > > # Although not fully supported you can run this machine on the mainline QEMU > 'xilinx-zynq-a9' machine > IMAGE_CLASSES += "qemuboot" > diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf > b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf > index d2fbf1b..d106a9d 100644 > --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf > +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf > @@ -31,7 +31,7 @@ KERNEL_DEVICETREE = "zynq-zc706.dtb" > > IMAGE_BOOT_FILES += " \ > boot.bin \ > - ${KERNEL_IMAGETYPE}-zynq-zc706.dtb \ > + ${@get_dtb_list(d)} \ > uEnv.txt \ > " > > diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf > b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf > index fe41148..d08348d 100644 > --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf > +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf > @@ -35,7 +35,7 @@ EXTRA_IMAGEDEPENDS += " \ > virtual/boot-bin \ > " > > -IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub > ${KERNEL_IMAGETYPE}-zynqmp-zcu102-rev1.0.dtb" > +IMAGE_BOOT_FILES += "uEnv.txt atf-uboot.ub ${@get_dtb_list(d)}" > > # This machine has a QEMU model, runqemu setup: > IMAGE_CLASSES += "qemuboot-xilinx" > diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf > b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf > index 114927d..fb09063 100644 > --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf > +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf > @@ -25,5 +25,5 @@ SERIAL_CONSOLE = "115200 ttyPS0" > > KERNEL_DEVICETREE = "zynq-zed.dtb" > > -IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${KERNEL_IMAGETYPE}-zynq-zed.dtb" > +IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${@get_dtb_list(d)}" > > diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf > b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf > index e94ad6b..796c98f 100644 > --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf > +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf > @@ -28,7 +28,7 @@ KERNEL_DEVICETREE = "zynq-zybo.dtb" > > IMAGE_BOOT_FILES += " \ > boot.bin \ > - ${KERNEL_IMAGETYPE}-zynq-zybo.dtb \ > + ${@get_dtb_list(d)} \ > uEnv.txt \ > " > > -- > 2.7.4 > > -- > _______________________________________________ > meta-xilinx mailing list > [email protected] > https://lists.yoctoproject.org/listinfo/meta-xilinx -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
