diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-18 20:26:09 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-22 08:19:01 -0800 |
| commit | f56bd29c4bc5944cc774fc8e318bb7664e92e54b (patch) | |
| tree | 5c8f3233c14991b8444921059e64107fec1d56da /meta-xilinx-standalone/recipes-bsp | |
| parent | bf738f3461a6ff9bc375ca013e129cd00f3c8992 (diff) | |
| download | meta-xilinx-f56bd29c4bc5944cc774fc8e318bb7664e92e54b.tar.gz | |
Move away from PACKAGE_ARCH = "BOARD_ARCH" or "BOARDVARIANT_ARCH"
PACKAGE_ARCH should not be MACHINE_ARCH, unless a specific override is
being used for compatibility.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-standalone/recipes-bsp')
4 files changed, 4 insertions, 12 deletions
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc index 03292633..99101d09 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc | |||
| @@ -7,9 +7,7 @@ COMPATIBLE_MACHINE = "none" | |||
| 7 | COMPATIBLE_MACHINE:zynq = ".*" | 7 | COMPATIBLE_MACHINE:zynq = ".*" |
| 8 | COMPATIBLE_MACHINE:zynqmp = ".*" | 8 | COMPATIBLE_MACHINE:zynqmp = ".*" |
| 9 | 9 | ||
| 10 | # Specify a default in case boardvariant isn't available | 10 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 11 | BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}" | ||
| 12 | PACKAGE_ARCH = "${BOARDVARIANT_ARCH}" | ||
| 13 | 11 | ||
| 14 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 15 | 13 | ||
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc index 08f4b4e1..355a55ed 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc | |||
| @@ -7,9 +7,7 @@ COMPATIBLE_HOST = "microblaze.*-elf" | |||
| 7 | COMPATIBLE_MACHINE = "none" | 7 | COMPATIBLE_MACHINE = "none" |
| 8 | COMPATIBLE_MACHINE:versal = ".*" | 8 | COMPATIBLE_MACHINE:versal = ".*" |
| 9 | 9 | ||
| 10 | # Specify a default in case boardvariant isn't available | 10 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 11 | BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}" | ||
| 12 | PACKAGE_ARCH = "${BOARDVARIANT_ARCH}" | ||
| 13 | 11 | ||
| 14 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 15 | B = "${S}/lib/sw_apps/versal_plm/src" | 13 | B = "${S}/lib/sw_apps/versal_plm/src" |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc index 9912fa0b..22352fab 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc | |||
| @@ -6,9 +6,7 @@ COMPATIBLE_HOST = "microblaze.*-elf" | |||
| 6 | COMPATIBLE_MACHINE = "none" | 6 | COMPATIBLE_MACHINE = "none" |
| 7 | COMPATIBLE_MACHINE:zynqmp = ".*" | 7 | COMPATIBLE_MACHINE:zynqmp = ".*" |
| 8 | 8 | ||
| 9 | # Specify a default in case boardvariant isn't available | 9 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 10 | BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}" | ||
| 11 | PACKAGE_ARCH = "${BOARDVARIANT_ARCH}" | ||
| 12 | 10 | ||
| 13 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
| 14 | B = "${S}/lib/sw_apps/zynqmp_pmufw/src" | 12 | B = "${S}/lib/sw_apps/zynqmp_pmufw/src" |
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc index 806592c2..2bdae284 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc | |||
| @@ -7,9 +7,7 @@ COMPATIBLE_HOST = "microblaze.*-elf" | |||
| 7 | COMPATIBLE_MACHINE = "none" | 7 | COMPATIBLE_MACHINE = "none" |
| 8 | COMPATIBLE_MACHINE:versal = ".*" | 8 | COMPATIBLE_MACHINE:versal = ".*" |
| 9 | 9 | ||
| 10 | # Specify a default in case boardvariant isn't available | 10 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 11 | BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}" | ||
| 12 | PACKAGE_ARCH = "${BOARDVARIANT_ARCH}" | ||
| 13 | 11 | ||
| 14 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 15 | B = "${S}/lib/sw_apps/versal_psmfw/src" | 13 | B = "${S}/lib/sw_apps/versal_psmfw/src" |