Initial restructure/split of meta-xilinx-bsp

Create a new meta-xilinx-core, move core functionality to the core, keeping
board specific files in the bsp layer.

zynqmp-generic changed from require <board> to include, so if meta-xilinx-bsp
is not available it will not fail.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
index bd28e702..6191d28d 100644
--- a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
@@ -24,7 +24,7 @@ do_install() {
   install -d ${D}/usr/include/
 
   cd ${S}/sdbuild/packages/libsds/libcma
-  CMA_ARCH=${CMA_ARCH_${TARGET_ARCH}} make install DESTDIR=${D}
+  CMA_ARCH=${CMA_ARCH:${TARGET_ARCH}} make install DESTDIR=${D}
 }
 
 SOLIBS = ".so"
diff --git a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
index 467414ed..a32290b4 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
@@ -19,11 +19,11 @@ SRC_URI = " \
 
 S="${WORKDIR}"
 
-PYNQ_DTSI ??= "pynq:zynqmp.dtsi"
-PYNQ_DTSI:zynqmp ?= "pynq:zynqmp.dtsi"
-PYNQ_DTSI:zynq ?= "pynq:zynq.dtsi"
-PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq:zynqmp_symbols.dtsi"
-PYNQ_SYMBOL_DTSI:zynq ?= "pynq:zynq_symbols.dtsi"
+PYNQ_DTSI ??= "pynq_zynqmp.dtsi"
+PYNQ_DTSI:zynqmp ?= "pynq_zynqmp.dtsi"
+PYNQ_DTSI:zynq ?= "pynq_zynq.dtsi"
+PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq_zynqmp_symbols.dtsi"
+PYNQ_SYMBOL_DTSI:zynq ?= "pynq_zynq_symbols.dtsi"
 PYNQ_DTBO ?= "pynq.dtbo"
 PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo"