diff options
| author | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-12 14:54:38 -0800 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-11-15 13:52:07 -0800 |
| commit | 2f44ba5a42966ac2cee77485209ec239123d7aa5 (patch) | |
| tree | 0135c5185f8c6a99cf4a6fd3db767d58f6e726ca /meta-xilinx-bsp/recipes-bsp | |
| parent | cd447cabee3052ab4c084a55149f5d9a232b380d (diff) | |
| download | meta-xilinx-2f44ba5a42966ac2cee77485209ec239123d7aa5.tar.gz | |
Convert to new override syntax
Fix various overrides that have been missed in previous conversion.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/recipes-bsp')
4 files changed, 11 insertions, 11 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 4f7e99f4..8f15a485 100644 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | |||
| @@ -71,7 +71,7 @@ EXTRA_OEMAKE:zynqmp:append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.get | |||
| 71 | 71 | ||
| 72 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}" | 72 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}" |
| 73 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" | 73 | EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}" |
| 74 | EXTRA_OEMAKE:append_vc-p-a2197-00-versal =" VERSAL_PLATFORM=silicon" | 74 | EXTRA_OEMAKE:append:vc-p-a2197-00-versal =" VERSAL_PLATFORM=silicon" |
| 75 | 75 | ||
| 76 | do_configure() { | 76 | do_configure() { |
| 77 | oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} | 77 | oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} |
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb index a729c07b..bcfe900d 100644 --- a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb +++ b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb | |||
| @@ -19,7 +19,7 @@ do_unpack[noexec] = "1" | |||
| 19 | do_patch[noexec] = "1" | 19 | do_patch[noexec] = "1" |
| 20 | 20 | ||
| 21 | PROC ??= "kc705_i/microblaze_0" | 21 | PROC ??= "kc705_i/microblaze_0" |
| 22 | PROC_kc705 = "kc705_i/microblaze_0" | 22 | PROC:kc705 = "kc705_i/microblaze_0" |
| 23 | 23 | ||
| 24 | FLASH_SIZE ??= "0x80" | 24 | FLASH_SIZE ??= "0x80" |
| 25 | FLASH_INTERFACE ??= "BPIx16" | 25 | FLASH_INTERFACE ??= "BPIx16" |
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb index c73e5fb1..3e71eeaf 100644 --- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb +++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb | |||
| @@ -32,21 +32,21 @@ PROVIDES = "virtual/dtb" | |||
| 32 | SRC_URI:append:zynq = " file://zynq-7000-qspi-dummy.dtsi" | 32 | SRC_URI:append:zynq = " file://zynq-7000-qspi-dummy.dtsi" |
| 33 | 33 | ||
| 34 | # device tree sources for the various machines | 34 | # device tree sources for the various machines |
| 35 | COMPATIBLE_MACHINE_picozed-zynq7 = ".*" | 35 | COMPATIBLE_MACHINE:picozed-zynq7 = ".*" |
| 36 | SRC_URI:append_picozed-zynq7 = " file://picozed-zynq7.dts" | 36 | SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts" |
| 37 | 37 | ||
| 38 | COMPATIBLE_MACHINE_qemu-zynq7 = ".*" | 38 | COMPATIBLE_MACHINE:qemu-zynq7 = ".*" |
| 39 | SRC_URI:append_qemu-zynq7 = " file://qemu-zynq7.dts" | 39 | SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts" |
| 40 | 40 | ||
| 41 | COMPATIBLE_MACHINE_zybo-linux-bd-zynq7 = ".*" | 41 | COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*" |
| 42 | SRC_URI:append_zybo-linux-bd-zynq7 = " \ | 42 | SRC_URI:append:zybo-linux-bd-zynq7 = " \ |
| 43 | file://zybo-linux-bd-zynq7.dts \ | 43 | file://zybo-linux-bd-zynq7.dts \ |
| 44 | file://pcw.dtsi \ | 44 | file://pcw.dtsi \ |
| 45 | file://pl.dtsi \ | 45 | file://pl.dtsi \ |
| 46 | " | 46 | " |
| 47 | 47 | ||
| 48 | COMPATIBLE_MACHINE_kc705-microblazeel = ".*" | 48 | COMPATIBLE_MACHINE:kc705-microblazeel = ".*" |
| 49 | SRC_URI:append_kc705-microblazeel = " \ | 49 | SRC_URI:append:kc705-microblazeel = " \ |
| 50 | file://kc705-microblazeel.dts \ | 50 | file://kc705-microblazeel.dts \ |
| 51 | file://pl.dtsi \ | 51 | file://pl.dtsi \ |
| 52 | file://system-conf.dtsi \ | 52 | file://system-conf.dtsi \ |
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb b/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb index cac8bbfc..7e7d2de3 100644 --- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb +++ b/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb | |||
| @@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 10 | inherit xilinx-platform-init | 10 | inherit xilinx-platform-init |
| 11 | 11 | ||
| 12 | COMPATIBLE_MACHINE = "$^" | 12 | COMPATIBLE_MACHINE = "$^" |
| 13 | COMPATIBLE_MACHINE_picozed-zynq7 = "picozed-zynq7" | 13 | COMPATIBLE_MACHINE:picozed-zynq7 = "picozed-zynq7" |
| 14 | 14 | ||
| 15 | LICENSE = "GPLv2+" | 15 | LICENSE = "GPLv2+" |
| 16 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | 16 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" |
