summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMubin Usman Sayyed <mubin.usman.sayyed@xilinx.com>2020-03-18 19:13:43 +0530
committerMark Hatle <mark.hatle@xilinx.com>2020-03-18 10:08:29 -0700
commit6cef85b32e2bc0fdb20dc23003d430434d426647 (patch)
tree989f093117ccf91ca84da26bd7e7085fc7f868ff
parent2e637d24fdfdb8abb539ecf789f7aeb23526486b (diff)
downloadmeta-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.bbclass5
-rw-r--r--meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend2
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"
24DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb" 24DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb"
25 25
26def get_xlnx_cmake_machine(fam, d): 26def 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
33def get_xlnx_cmake_processor(tune, machine, d): 36def 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 = ".*"
6COMPATIBLE_MACHINE_microblaze-plm = ".*" 6COMPATIBLE_MACHINE_microblaze-plm = ".*"
7COMPATIBLE_MACHINE_cortexa72-versal = ".*" 7COMPATIBLE_MACHINE_cortexa72-versal = ".*"
8COMPATIBLE_MACHINE_cortexr5-versal = ".*" 8COMPATIBLE_MACHINE_cortexr5-versal = ".*"
9COMPATIBLE_MACHINE_cortexa9-zynq = ".*"
9 10
10XSCTH_PROC_cortexa53-zynqmp ??= "psu_cortexa53_0" 11XSCTH_PROC_cortexa53-zynqmp ??= "psu_cortexa53_0"
11XSCTH_PROC_cortexr5-zynqmp ??= "psu_cortexr5_0" 12XSCTH_PROC_cortexr5-zynqmp ??= "psu_cortexr5_0"
@@ -13,6 +14,7 @@ XSCTH_PROC_microblaze-pmu ??= "psu_pmu_0"
13XSCTH_PROC_cortexa72-versal ??= "psv_cortexa72_0" 14XSCTH_PROC_cortexa72-versal ??= "psv_cortexa72_0"
14XSCTH_PROC_microblaze-plm ??= "psv_pmc_0" 15XSCTH_PROC_microblaze-plm ??= "psv_pmc_0"
15XSCTH_PROC_cortexr5-versal ??= "psv_cortexr5_0" 16XSCTH_PROC_cortexr5-versal ??= "psv_cortexr5_0"
17XSCTH_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
18DTC_FLAGS_append_xilinx-standalone = " -@" 20DTC_FLAGS_append_xilinx-standalone = " -@"