From 752434ed40576ef869548719d85681820ca7ae43 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Mon, 7 Nov 2022 14:12:50 -0800
Subject: conf/machine: Add all of the zynqmp and versal variants

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-core/conf/machine/versal-ai-core-generic.conf | 12 ++++++++++++
 meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf | 12 ++++++++++++
 meta-xilinx-core/conf/machine/versal-hbm-generic.conf     | 12 ++++++++++++
 meta-xilinx-core/conf/machine/versal-net-generic.conf     |  4 ++--
 meta-xilinx-core/conf/machine/versal-premium-generic.conf | 12 ++++++++++++
 meta-xilinx-core/conf/machine/versal-prime-generic.conf   | 12 ++++++++++++
 meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf      | 12 ++++++++++++
 meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf      | 12 ++++++++++++
 meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf      | 12 ++++++++++++
 meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf      | 12 ++++++++++++
 10 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/versal-hbm-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/versal-premium-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/versal-prime-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
 create mode 100644 meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf

diff --git a/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
new file mode 100644
index 00000000..34f57691
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-ai-core-generic:']['versal-ai-core-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/versal-generic.conf
+
+SOC_VARIANT = "ai-core"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_ai_core_generic']['versal-ai-core-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
new file mode 100644
index 00000000..bf5523ed
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-ai-edge-generic:']['versal-ai-edge-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/versal-generic.conf
+
+SOC_VARIANT = "ai-edge"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_ai_edge_generic']['versal-ai-edge-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
new file mode 100644
index 00000000..23fffcb9
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-hbm-generic:']['versal-hbm-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/versal-generic.conf
+
+SOC_VARIANT = "hbm"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_hbm_generic']['versal-hbm-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 611d9de4..7b410aaa 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -6,13 +6,13 @@
 MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${MACHINE}']}"
 #### Regular settings follow
 
-SOC_VARIANT = "net"
-
 # Must be set first, or versal-generic will set it
 UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
 
 require conf/machine/versal-generic.conf
 
+SOC_VARIANT = "net"
+
 HDF_MACHINE = "versal-net-generic"
 
 QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
diff --git a/meta-xilinx-core/conf/machine/versal-premium-generic.conf b/meta-xilinx-core/conf/machine/versal-premium-generic.conf
new file mode 100644
index 00000000..d785edff
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-premium-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-premium-generic:']['versal-premium-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/versal-generic.conf
+
+SOC_VARIANT = "premium"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_premium_generic']['versal-premium-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/versal-prime-generic.conf b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
new file mode 100644
index 00000000..94e9b05e
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-prime-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-prime-generic:']['versal-prime-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/versal-generic.conf
+
+SOC_VARIANT = "prime"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_prime_generic']['versal-prime-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
new file mode 100644
index 00000000..38c9126f
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-cg-generic:']['zynqmp-cg-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/zynqmp-generic.conf
+
+SOC_VARIANT = "cg"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_cg_generic']['zynqmp-cg-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
new file mode 100644
index 00000000..fbe445aa
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-dr-generic:']['zynqmp-dr-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/zynqmp-generic.conf
+
+SOC_VARIANT = "dr"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_dr_generic']['zynqmp-dr-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
new file mode 100644
index 00000000..33375b46
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-eg-generic:']['zynqmp-eg-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/zynqmp-generic.conf
+
+SOC_VARIANT = "eg"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_eg_generic']['zynqmp-eg-generic' != "${MACHINE}"]}"
+
diff --git a/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf
new file mode 100644
index 00000000..f2ffe40f
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf
@@ -0,0 +1,12 @@
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-ev-generic:']['zynqmp-ev-generic' != '${MACHINE}']}"
+#### Regular settings follow
+
+require conf/machine/zynqmp-generic.conf
+
+SOC_VARIANT = "ev"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_ev_generic']['zynqmp-ev-generic' != "${MACHINE}"]}"
+
-- 
cgit v1.2.3-54-g00ecf