[rocko/master][PATCH] cmem.inc: add arm64 support for cmem injection

[rocko/master][PATCH] cmem.inc: add arm64 support for cmem injection

[Denys Dmytriyenko]

Since cmem 4.16 now supports arm64, update cmem injection code accordingly
to work with arm64 DTS files.

Cc: Sam Nelson <sam.nelson@ti.com>
Cc: Jacob Stiffler <j-stiffler@ti.com>
Cc: Suman Anna <s-anna@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 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

Re: [rocko/master][PATCH] cmem.inc: add arm64 support for cmem injection

[Suman Anna]

On 1/8/19 9:02 PM, Denys Dmytriyenko wrote:
> Since cmem 4.16 now supports arm64, update cmem injection code accordingly
> to work with arm64 DTS files.
> 
> Cc: Sam Nelson <sam.nelson@ti.com>
> Cc: Jacob Stiffler <j-stiffler@ti.com>
> Cc: Suman Anna <s-anna@ti.com>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

Thanks for the patch Denys. This is definitely needed to scale for both
v7 and v8 platforms.

Reviewed-by: Suman Anna <s-anna@ti.com>

> ---
>  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():
>