From fbac6f60fa6233cb79bda8f141c7216f93b6012f Mon Sep 17 00:00:00 2001 From: Naga Sureshkumar Relli Date: Tue, 20 Apr 2021 02:12:32 -0600 Subject: Update the lop file as per new cpu cluster naming There are changes in microblaze cpu cluster node_name and node_labels. so update the lop file accordingly to generate microblaze tune macros. Previously the microblaze.conf is generated like below For Versal: AVAILTUNES += "microblaze-cpu2" TUNE_FEATURES_tune-microblaze-cpu2 = " microblaze v10.0 barrel-shift pattern-compare reorder multiply-high divide-hard fpu-soft" PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu2 = "${TUNE_PKGARCH}" TUNE_FEATURES_tune-pmc-microblaze = ${TUNE_FEATURES_tune-microblaze-cpu2} AVAILTUNES += "microblaze-cpu3" TUNE_FEATURES_tune-microblaze-cpu3 = " microblaze v10.0 barrel-shift pattern-compare reorder multiply-high divide-hard fpu-soft" PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu3 = "${TUNE_PKGARCH}" TUNE_FEATURES_tune-psm-microblaze = ${TUNE_FEATURES_tune-microblaze-cpu3} For Zynqmp: AVAILTUNES += "microblaze-cpu0" TUNE_FEATURES_tune-microblaze-cpu0 = " microblaze v9.2 barrel-shift pattern-compare reorder fpu-soft" PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu0 = "${TUNE_PKGARCH}" TUNE_FEATURES_tune-pmu-microblaze = "${TUNE_FEATURES_tune-microblaze-cpu0}" With the new changes the microblaze.conf is generated like below For Versal: AVAILTUNES += "microblaze-cpu0" TUNE_FEATURES_tune-microblaze-cpu0 = " microblaze v10.0 barrel-shift pattern-compare reorder multiply-high divide-hard fpu-soft" PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu0 = "${TUNE_PKGARCH}" TUNE_FEATURES_tune-pmc-microblaze = "${TUNE_FEATURES_tune-microblaze-cpu0}" AVAILTUNES += "microblaze-cpu1" TUNE_FEATURES_tune-microblaze-cpu1 = " microblaze v10.0 barrel-shift pattern-compare reorder multiply-high divide-hard fpu-soft" PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu1 = "${TUNE_PKGARCH}" TUNE_FEATURES_tune-psm-microblaze = "${TUNE_FEATURES_tune-microblaze-cpu1}" For Zynqmp: No change the cpu index is changed because the cpu@0 for cpus_microblaze is same for both pmc and psm, hence for better readability we updated the lop file to generate cpu0 for pmc and cpu1 for psm. Signed-off-by: Naga Sureshkumar Relli --- .../recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts index 932fcd24..d710c10f 100644 --- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts +++ b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts @@ -224,8 +224,11 @@ lop_output_code { compatible = "system-device-tree-v1,lop,code-v1"; code = " + cpu_addr = 0 for n in __selected__: - tname = re.sub( '@', '', n.name ) + tname = re.split('@', n.name) + tname = tname[0]+str(cpu_addr) + cpu_addr += 1 print( 'AVAILTUNES += \"microblaze-%s\"' % tname ) print( 'TUNE_FEATURES_tune-microblaze-%s = \"' % tname, end='' ) for t in n.tunes.values(): -- cgit v1.2.3-54-g00ecf