Change the order of the MACHINEOVERRIDES to ensure consistent behavior

Issue: CR-1100158

Previously the final order of the MACHINEOVERRIDES was effectively:

 zynqmp_graphics:board_variant:board:soc_variant:soc:aarch64:armv8a:cortexa72-cortexa53:machine

The correct order should be least important to most important:

 aarch64:armv8a:cortexa72-cortexa53:zynqmp_graphics:soc:soc_variant:machine:board:board_variant

This change accomplishes that by adjusting the order of the .= / =. of the
MACHINEOVERRIDES values.  This changes the order of a few standard requires,
adjusts how the zynqmp_graphics is added, and changes the order of the
soc/soc_variant settings.

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

6 files changed, 25 insertions, 9 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
index 403b3264..1d0b1e2e 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
@@ -8,8 +8,8 @@ SOC_FAMILY ?= "versal"
 
 SOC_VARIANT ?= "prime"
 
-require soc-tune-include.inc
 require xilinx-soc-family.inc
+require soc-tune-include.inc
 
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "Image"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
index 4284cff8..4459f3c4 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
@@ -7,8 +7,8 @@ SOC_FAMILY ?= "zynq"
 
 SOC_VARIANT ?= "7z"
 
-require soc-tune-include.inc
 require xilinx-soc-family.inc
+require soc-tune-include.inc
 
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "uImage"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index 31070822..395cf7f4 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
@@ -9,11 +9,15 @@ SOC_FAMILY ?= "zynqmp"
 
 SOC_VARIANT ?= "eg"
 
-MACHINEOVERRIDES_prepend_zynqmp-eg = "mali400:"
-MACHINEOVERRIDES_prepend_zynqmp-ev = "mali400:vcu:"
+require xilinx-soc-family.inc
+
+GRAPHICSOVERRIDES = ""
+GRAPHICSOVERRIDES_zynqmp-eg = "mali400:"
+GRAPHICSOVERRIDES_zynqmp-ev = "mali400:vcu:"
+
+MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}"
 
 require soc-tune-include.inc
-require xilinx-soc-family.inc
 
 # Linux Configuration
 KERNEL_IMAGETYPE ?= "Image"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index 9613a154..dc659fd3 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -1,8 +1,8 @@
 BOARD ??= ""
 BOARD_VARIANT ??= ""
 
-MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
-MACHINEOVERRIDES =. "${@['', '${BOARD}-${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
+MACHINEOVERRIDES .= "${@['', ':${BOARD}']['${BOARD}' != '']}"
+MACHINEOVERRIDES .= "${@['', ':${BOARD}-${BOARD_VARIANT}']['${BOARD_VARIANT}' != '']}"
 
 
 BOARD_ARCH ?= "${BOARD}"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig
new file mode 100644
index 00000000..9613a154
--- /dev/null
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig
@@ -0,0 +1,12 @@
+BOARD ??= ""
+BOARD_VARIANT ??= ""
+
+MACHINEOVERRIDES =. "${@['', '${BOARD}:']['${BOARD}' != '']}"
+MACHINEOVERRIDES =. "${@['', '${BOARD}-${BOARD_VARIANT}:']['${BOARD_VARIANT}' != '']}"
+
+
+BOARD_ARCH ?= "${BOARD}"
+BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD}'][d.getVar('BOARD_VARIANT')=='']}"
+
+PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
index 75df2fe1..0eddb16b 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
@@ -1,8 +1,8 @@
-require conf/machine/include/soc-family.inc
-
 SOC_VARIANT ??= ""
 MACHINEOVERRIDES =. "${@['', '${SOC_FAMILY}-${SOC_VARIANT}:']['${SOC_VARIANT}' != '']}"
 
+require conf/machine/include/soc-family.inc
+
 SOC_FAMILY_ARCH ?= "${SOC_FAMILY}"
 SOC_VARIANT_ARCH ?= "${@['${SOC_FAMILY}-${SOC_VARIANT}','${SOC_FAMILY}'][d.getVar('SOC_VARIANT')=='']}"