From 890b91fa31a819e804feb6b8bef37c16b6fba75f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 20 Dec 2021 09:02:38 -0800 Subject: meta-xilinx-standalone: Move from cortexr5f to cortexr5 After moving from Xilinx specific cortex r5 turning file, the 5f is no longer defined. Move to the now standard 'cortexr5' definition. Signed-off-by: Mark Hatle --- meta-xilinx-standalone-experimental/classes/esw.bbclass | 2 +- .../recipes-core/meta/files/dt-processor.sh | 4 ++-- meta-xilinx-standalone/conf/machine/cortexr5-versal.conf | 2 +- meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index 5de88bc8..df1c28a4 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass @@ -53,7 +53,7 @@ def get_xlnx_cmake_processor(tune, machine, d): cmake_processor = 'plm_microblaze' else: cmake_processor = 'microblaze' - elif (tune in [ 'cortexr5', 'cortexr5f' ]): + elif tune == 'cortexr5': cmake_processor = 'cortexr5' elif tune.startswith('cortexa9'): cmake_processor = 'cortexa9' diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh index d47ebe52..96054979 100755 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh @@ -477,7 +477,7 @@ cortex_r5_baremetal() { cat <"${conf_file}" CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" ESW_MACHINE = "cortexr5-${machine}" -DEFAULTTUNE = "cortexr5f" +DEFAULTTUNE = "cortexr5" TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" @@ -529,7 +529,7 @@ cortex_r5_freertos() { cat <"${conf_file}" CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}" ESW_MACHINE = "cortexr5-${machine}" -DEFAULTTUNE = "cortexr5f" +DEFAULTTUNE = "cortexr5" TMPDIR = "\${BASE_TMPDIR}/tmp-${dtb_file%%.dtb}" diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf b/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf index fa58dc00..193070bc 100644 --- a/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf +++ b/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf @@ -1,3 +1,3 @@ -DEFAULTTUNE ?= "cortexr5f" +DEFAULTTUNE ?= "cortexr5" require conf/machine/include/soc-versal.inc diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf b/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf index 817150f8..1cbdfc7c 100644 --- a/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf +++ b/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf @@ -1,3 +1,3 @@ -DEFAULTTUNE ?= "cortexr5f" +DEFAULTTUNE ?= "cortexr5" require conf/machine/include/soc-zynqmp.inc -- cgit v1.2.3-54-g00ecf