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>

3 files changed, 41 insertions, 30 deletions

diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
index ea93f715..3ae01ac1 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
@@ -26,8 +26,8 @@ do_install() {
 }
 
 do_deploy() {
-    install -d ${DEPLOYDIR}/${MACHINE}-${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${MACHINE}-${BPN}/
+    install -d ${DEPLOYDIR}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
index 5a01c33e..88046966 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -32,10 +32,10 @@ however you may use any path you wish.
 . <build>/prestep/environment-setup-x86_64-petalinux-linux
 
 # Run the script from the same directory as this README
-<build>/prestep/dt-processor.sh <path_to_conf> <dtb>
+<build>/prestep/dt-processor.sh -c <conf> -s <dtb>
 
 # For example, zynqmp:
-# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/zu-sdt/system-top.dts
+# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/zu-sdt/system-top.dts
 #
 # Follow the instructions returned by the script!
 # Such as:
@@ -61,7 +61,7 @@ PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MAC
 # OR
 #
 # Versal:
-# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/vck190-sdt/system-top.dts
+# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/vck190-sdt/system-top.dts
 #
 # Follow the instructions returned by the script!
 # Such as:
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 243a2cfd..a8da5b4a 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
@@ -89,7 +89,7 @@ detect_machine() {
 }
 
 cortex_a53_linux() {
-  info "coretex-a53 for Linux [ $1 ]"
+  info "cortex-a53 for Linux [ $1 ]"
 
   if [ "$1" = "None" ]; then
     dtb_file="cortexa53-${machine}-linux.dtb"
@@ -130,11 +130,11 @@ cortex_a53_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
+SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE_${machine}-generic = ""
+KERNEL_DEVICETREE:${machine}-generic = ""
 # We need u-boot to use the one we passed in
-DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Remap boot files to ensure the right device tree is listed first
@@ -146,9 +146,9 @@ a53_fsbl_done=0
 cortex_a53_baremetal() {
   if [ "$1" = "fsbl" ]; then
     [ ${a53_fsbl_done} = 1 ] && return
-    info "coretex-a53 FSBL baremetal configuration"
+    info "cortex-a53 FSBL baremetal configuration"
   else
-    info "coretex-a53 for baremetal [ $1 ]"
+    info "cortex-a53 for baremetal [ $1 ]"
   fi
 
   suffix=""; lto="-nolto"
@@ -210,7 +210,7 @@ EOF
 }
 
 cortex_a53_freertos() {
-  info "coretex-a53 for FreeRTOS [ $1 ]"
+  info "cortex-a53 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -262,7 +262,7 @@ EOF
 }
 
 cortex_a72_linux() {
-  info "coretex-a72 for Linux [ $1 ]"
+  info "cortex-a72 for Linux [ $1 ]"
 
   if [ "$1" = "None" ]; then
     dtb_file="cortexa72-${machine}-linux.dtb"
@@ -305,11 +305,11 @@ cortex_a72_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
+SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE_${machine}-generic = ""
+KERNEL_DEVICETREE:${machine}-generic = ""
 # We need u-boot to use the one we passed in
-DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Remap boot files to ensure the right device tree is listed first
@@ -318,7 +318,7 @@ EOF
 }
 
 cortex_a72_baremetal() {
-  info "coretex-a72 for baremetal [ $1 ]"
+  info "cortex-a72 for baremetal [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -370,7 +370,7 @@ EOF
 }
 
 cortex_a72_freertos() {
-  info "coretex-a72 for FreeRTOS [ $1 ]"
+  info "cortex-a72 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -425,9 +425,9 @@ r5_fsbl_done=0
 cortex_r5_baremetal() {
   if [ "$1" = "fsbl" ]; then
     [ ${r5_fsbl_done} = 1 ] && return
-    info "coretex-r5 FSBL baremetal configuration"
+    info "cortex-r5 FSBL baremetal configuration"
   else
-    info "coretex-r5 for baremetal [ $1 ]"
+    info "cortex-r5 for baremetal [ $1 ]"
   fi
 
   suffix=""; lto="-nolto"
@@ -451,14 +451,25 @@ cortex_r5_baremetal() {
   # Build device tree
   (
     cd dtb || error "Unable to cd to dtb dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-      "${system_dtb}" "${dtb_file}" || error "lopper.py failed"
+    if [ -n "$domain_file" ]; then
+      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \
+        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \
+        || error "lopper.py failed"
+    else
+      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
+        "${system_dtb}" "${dtb_file}" || error "lopper.py failed"
+    fi
     rm -f lop-r5-imux.dts.dtb
   )
 
   # Build baremetal multiconfig
-  ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
-    || error "lopper.py failed"
+  if [ -n "${domain_file}" ]; then
+    ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
+  else
+    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
+      || error "lopper.py failed"
+  fi
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
@@ -478,7 +489,7 @@ EOF
 }
 
 cortex_r5_freertos() {
-  info "coretex-r5 for FreeRTOS [ $1 ]"
+  info "cortex-r5 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -506,7 +517,7 @@ cortex_r5_freertos() {
   # Build baremetal multiconfig
   if [ -n "${domain_file}" ]; then
     ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
-      -- baremetaldrvlist_xlnx coretexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
+      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
   else
     ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
       || error "lopper.py failed"
@@ -585,7 +596,7 @@ ESW_MACHINE = "microblaze-pmu"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmu-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmu-microblaze}"
 
 TARGET_CFLAGS += "-DPSU_PMU=1U"
 
@@ -637,7 +648,7 @@ ESW_MACHINE = "microblaze-plm"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmc-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmc-microblaze}"
 
 TARGET_CFLAGS += "-DVERSAL_PLM=1"
 
@@ -689,7 +700,7 @@ ESW_MACHINE = "microblaze-psm"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-psm-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-psm-microblaze}"
 
 TARGET_CFLAGS += "-DVERSAL_psm=1"
 
@@ -808,7 +819,7 @@ gen_local_conf() {
   echo "To enable this, add the following to your local.conf:"
   echo
   echo "# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere"
-  echo "BASE_TMPDIR = \"${TOPDIR}\""
+  echo "BASE_TMPDIR = \"\${TOPDIR}\""
   [ -n "${system_conf}" ] && echo "require ${system_conf}"
   echo "SYSTEM_DTFILE = \"${system_dtb}\""
   echo "BBMULTICONFIG += \"${multiconf}\""