Revise COMPATIBLE_MACHINE settings

Change the compatible machine so that everything is compatible with the
esw software.  Then select specific recipes that have more precise
compatibility requirements.

The COMPATIBLE_MACHINE is a regex, so we can use this to select zynqmp,
microblaze or other components as necessary.

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

6 files changed, 7 insertions, 25 deletions

diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass
index 4a58f705..0748b569 100644
--- a/meta-xilinx-standalone/classes/esw.bbclass
+++ b/meta-xilinx-standalone/classes/esw.bbclass
@@ -18,24 +18,6 @@ OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 
 inherit ccmake
 
-# TODO
-# We need to put these per recipe probably, e.g. pmu on mb, fsbl on a53
-COMPATIBLE_HOST_microblaze-pmu = "microblaze.*-elf"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_microblaze-pmu = "microblaze-pmu"
-
-COMPATIBLE_HOST_microblaze-plm = "microblaze.*-elf"
-COMPATIBLE_MACHINE_microblaze-plm = "microblaze-plm"
-
-COMPATIBLE_HOST_cortexa53-zynqmp = "aarch64.*-elf"
-COMPATIBLE_MACHINE_cortexa53-zynqmp = "cortexa53-zynqmp"
-
-COMPATIBLE_MACHINE_cortexr5-zynqmp = "cortexr5-zynqmp"
-COMPATIBLE_MACHINE_cortexr5-versal = "cortexr5-versal"
-
-COMPATIBLE_HOST_cortexa72-versal = "aarch64.*-elf"
-COMPATIBLE_MACHINE_cortexa72-versal = "cortexa72-versal"
-
 COMPATIBLE_OS = "elf"
 COMPATIBLE_OS_arm = "eabi"
 
diff --git a/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb b/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb
index 17dbadbd..19238f97 100644
--- a/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb
+++ b/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb
@@ -1,5 +1,7 @@
 inherit esw deploy
 
+COMPATIBLE_MACHINE = "microblaze-pmu"
+
 ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
 
 DEPENDS += "xilstandalone xiltimer xilfpga xilskey"
diff --git a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb b/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
index 93913c1f..789f51bc 100644
--- a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
+++ b/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
@@ -1,5 +1,7 @@
 inherit esw deploy
 
+COMPATIBLE_MACHINE = ".*-zynqmp"
+
 ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_fsbl/src"
 
 DEPENDS += "xilstandalone xiltimer xilffs xilsecure xilpm device-tree"
diff --git a/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb
index de37205f..c5a68ef1 100644
--- a/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/plm/plm_2020.1.bb
@@ -9,8 +9,7 @@ PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
 SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
 
 COMPATIBLE_HOST = "microblaze.*-elf"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal-mb = "versal-mb"
+COMPATIBLE_MACHINE = "versal-mb"
 
 
 S = "${WORKDIR}/git/lib/sw_apps/versal_plm/src"
diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
index 61a3d2de..3ed9c55a 100644
--- a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2020.1.bb
@@ -9,9 +9,7 @@ PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
 SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
 
 COMPATIBLE_HOST = "microblaze.*-elf"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_microblaze-pmu = "microblaze-pmu"
-
+COMPATIBLE_MACHINE = "microblaze-pmu"
 
 S = "${WORKDIR}/git/lib/sw_apps/zynqmp_pmufw/src"
 
diff --git a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb
index 7523f9a0..cd346b12 100644
--- a/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb
+++ b/meta-xilinx-standalone/recipes-standalone/psm-firmware/psm-firmware_2020.1.bb
@@ -9,8 +9,7 @@ PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
 SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
 
 COMPATIBLE_HOST = "microblaze.*-elf"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal-mb = "versal-mb"
+COMPATIBLE_MACHINE = "versal-mb"
 
 
 S = "${WORKDIR}/git/lib/sw_apps/versal_psmfw/src"