Since cmem 4.16 now supports arm64, update cmem injection code accordingly to work with arm64 DTS files.
Cc: Sam Nelson <[email protected]> Cc: Jacob Stiffler <[email protected]> Cc: Suman Anna <[email protected]> Signed-off-by: Denys Dmytriyenko <[email protected]> --- recipes-kernel/linux/cmem.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-kernel/linux/cmem.inc b/recipes-kernel/linux/cmem.inc index 0327557f..5fd0b9d9 100644 --- a/recipes-kernel/linux/cmem.inc +++ b/recipes-kernel/linux/cmem.inc @@ -70,11 +70,14 @@ python do_setup_cmem() { # Get destination directory and destination dtsi filename which adds # the MACHINE prefix. - dst_dir = os.path.join(localdata.getVar('S'), 'arch/arm/boot/dts') + dst_dir = os.path.join(localdata.getVar('S'), localdata.expand('arch/${ARCH}/boot/dts')) dst_dtsi = localdata.expand('${MACHINE}-${CMEM_DTSI}') # Copy cmem.dtsi into source tree - shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,dst_dtsi)) + if localdata.getVar('ARCH') is 'arm64': + shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,'ti',dst_dtsi)) + else: + shutil.copy(os.path.join(src_dir,src_dtsi), os.path.join(dst_dir,dst_dtsi)) # Inject dtsi into each dts in list for dtb in (localdata.getVar('CMEM_DEVICETREE') or '').split(): -- 2.17.1 -- _______________________________________________ meta-ti mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-ti
