Adjust generic BSPs to support the inheritance model

Each inherited BSP must set a MACHINEOVERRIDES and PACKAGE_EXTRA_ARCHS to
ensure that various overrides can be set along the way.  The general format
for this is (in the caller):

require conf/machine/<inherited machine>.conf

The callee is responsible for adding to the MACHINEOVERRIDES and
PACKAGE_EXTRA_ARCHS.  It does this by setting the following at the beginning
and end of the file, respectively.

MACHINEOVERRIDES =. "${@['', '<machine>:']['<machine>' != '${MACHINE}']}"
...
...
PACKAGE_EXTRA_ARCHS_append = "${@['', ' <machine_arch>']['<machine>' != '${MACHINE}']}"

where <machine> is the <machine>.conf file the line appears in;
<machine_arch> is the <machine>.replace('-', '_') (matching MACHINE_ARCH) if
the machine file was used by itself.

The MACHINEOVERRIDES uses =. or .= everywhere in the Yocto Project.  Doing it
via =. in the load order ensures in order evaluation.

PACKAGE_EXTRA_ARCHS is set via 'append', but needs to be the last operation
to ensure that we are always added AFTER anything we include along the way.
Effectively this is a late binding evaluation.

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

4 files changed, 32 insertions, 0 deletions

diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 0ba5b80a..9004282a 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -7,6 +7,10 @@ USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD")
 require ${USE_BOARD}
 unset USE_BOARD
 
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'microblaze-generic:']['microblaze-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
 # Set the default for a modern full feature microblaze...
 TUNE_FEATURES:tune-microblaze ?= "microblaze v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high"
 DEFAULTTUNE ?= "microblaze"
@@ -35,6 +39,10 @@ EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-nativ
 UBOOT_MACHINE ?= "microblaze-generic_defconfig"
 UBOOT_INITIAL_ENV = ""
 
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
+
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
 require ${USE_BOARD}
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index a5d99b75..3509d8c4 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -7,6 +7,10 @@ USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD")
 require ${USE_BOARD}
 unset USE_BOARD
 
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
@@ -89,6 +93,10 @@ QB_PLM_OPT = " \
     "
 QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
 
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_generic']['versal-generic' != "${MACHINE}"]}"
+
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
 require ${USE_BOARD}
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 4a903282..3271051d 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -7,6 +7,10 @@ USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD")
 require ${USE_BOARD}
 unset USE_BOARD
 
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynq-generic:']['zynq-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
@@ -44,6 +48,10 @@ QB_OPT_APPEND = " \
         -device loader,addr=0xF8000910,data=0xF,data-len=0x4 \
         "
 
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynq_generic']['zynq-generic' != "${MACHINE}"]}"
+
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
 require ${USE_BOARD}
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index 317b3fc7..7f89b958 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -7,6 +7,10 @@ USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD")
 require ${USE_BOARD}
 unset USE_BOARD
 
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
 # CG is the lowest common demoninator, so use this by default
 SOC_VARIANT ?= "cg"
 
@@ -85,6 +89,10 @@ QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
 
 do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy"
 
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_generic']['zynqmp-generic' != "${MACHINE}"]}"
+
 # Deprecated board config
 USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
 require ${USE_BOARD}