diff options
author | Mubin Usman Sayyed <mubin.usman.sayyed@xilinx.com> | 2020-03-18 19:13:43 +0530 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2020-03-18 10:08:29 -0700 |
commit | 6cef85b32e2bc0fdb20dc23003d430434d426647 (patch) | |
tree | 989f093117ccf91ca84da26bd7e7085fc7f868ff | |
parent | 2e637d24fdfdb8abb539ecf789f7aeb23526486b (diff) | |
download | meta-xilinx-6cef85b32e2bc0fdb20dc23003d430434d426647.tar.gz |
meta-xilinx-standalone: Add support for zynq
Updated COMPATIBLE_MACHINE, DTBFILE, XSCTH_PROC
and some other variables related to CMAKE build system.
Signed-off-by: Mubin Usman Sayyed <mubin.usman.sayyed@xilinx.com>
Rebase for updated esw/compatible machine changes.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r-- | meta-xilinx-standalone/classes/esw.bbclass | 5 | ||||
-rw-r--r-- | meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass index cca1af04..50fc7128 100644 --- a/meta-xilinx-standalone/classes/esw.bbclass +++ b/meta-xilinx-standalone/classes/esw.bbclass | |||
@@ -24,10 +24,13 @@ COMPATIBLE_OS_arm = "eabi" | |||
24 | DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb" | 24 | DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb" |
25 | 25 | ||
26 | def get_xlnx_cmake_machine(fam, d): | 26 | def get_xlnx_cmake_machine(fam, d): |
27 | cmake_machine = fam | ||
27 | if (fam == 'zynqmp'): | 28 | if (fam == 'zynqmp'): |
28 | cmake_machine = 'ZynqMP' | 29 | cmake_machine = 'ZynqMP' |
29 | elif (fam == 'versal'): | 30 | elif (fam == 'versal'): |
30 | cmake_machine = 'Versal' | 31 | cmake_machine = 'Versal' |
32 | elif (fam == 'zynq'): | ||
33 | cmake_machine = 'Zynq' | ||
31 | return cmake_machine | 34 | return cmake_machine |
32 | 35 | ||
33 | def get_xlnx_cmake_processor(tune, machine, d): | 36 | def get_xlnx_cmake_processor(tune, machine, d): |
@@ -41,6 +44,8 @@ def get_xlnx_cmake_processor(tune, machine, d): | |||
41 | cmake_processor = 'microblaze' | 44 | cmake_processor = 'microblaze' |
42 | elif (tune in [ 'cortexr5', 'cortexr5f' ]): | 45 | elif (tune in [ 'cortexr5', 'cortexr5f' ]): |
43 | cmake_processor = 'cortexr5' | 46 | cmake_processor = 'cortexr5' |
47 | elif tune.startswith('cortexa9'): | ||
48 | cmake_processor = 'cortexa9' | ||
44 | elif (tune in [ 'cortexa53', 'cortexa72-cortexa53' ]): | 49 | elif (tune in [ 'cortexa53', 'cortexa72-cortexa53' ]): |
45 | cmake_processor = 'cortexa53' | 50 | cmake_processor = 'cortexa53' |
46 | elif tune == 'cortexa72': | 51 | elif tune == 'cortexa72': |
diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend index abc96dd6..851b9eae 100644 --- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend | |||
@@ -6,6 +6,7 @@ COMPATIBLE_MACHINE_microblaze-pmu = ".*" | |||
6 | COMPATIBLE_MACHINE_microblaze-plm = ".*" | 6 | COMPATIBLE_MACHINE_microblaze-plm = ".*" |
7 | COMPATIBLE_MACHINE_cortexa72-versal = ".*" | 7 | COMPATIBLE_MACHINE_cortexa72-versal = ".*" |
8 | COMPATIBLE_MACHINE_cortexr5-versal = ".*" | 8 | COMPATIBLE_MACHINE_cortexr5-versal = ".*" |
9 | COMPATIBLE_MACHINE_cortexa9-zynq = ".*" | ||
9 | 10 | ||
10 | XSCTH_PROC_cortexa53-zynqmp ??= "psu_cortexa53_0" | 11 | XSCTH_PROC_cortexa53-zynqmp ??= "psu_cortexa53_0" |
11 | XSCTH_PROC_cortexr5-zynqmp ??= "psu_cortexr5_0" | 12 | XSCTH_PROC_cortexr5-zynqmp ??= "psu_cortexr5_0" |
@@ -13,6 +14,7 @@ XSCTH_PROC_microblaze-pmu ??= "psu_pmu_0" | |||
13 | XSCTH_PROC_cortexa72-versal ??= "psv_cortexa72_0" | 14 | XSCTH_PROC_cortexa72-versal ??= "psv_cortexa72_0" |
14 | XSCTH_PROC_microblaze-plm ??= "psv_pmc_0" | 15 | XSCTH_PROC_microblaze-plm ??= "psv_pmc_0" |
15 | XSCTH_PROC_cortexr5-versal ??= "psv_cortexr5_0" | 16 | XSCTH_PROC_cortexr5-versal ??= "psv_cortexr5_0" |
17 | XSCTH_PROC_cortexa9-zynq ??= "ps7_cortexa9_0" | ||
16 | 18 | ||
17 | # Enable @ flag on dtc which is required by libxil | 19 | # Enable @ flag on dtc which is required by libxil |
18 | DTC_FLAGS_append_xilinx-standalone = " -@" | 20 | DTC_FLAGS_append_xilinx-standalone = " -@" |