summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-11-02 01:02:46 -0700
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-11-02 01:02:46 -0700
commit294482da9a3dffbbe503e0ed281952659dea4da6 (patch)
tree710eafbaf4acb4ebbd9ac28533abd52211010867
parentcc249f8c8a22fe284bfa8f02244810063dbbdd60 (diff)
downloadmeta-xilinx-294482da9a3dffbbe503e0ed281952659dea4da6.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use : as the override character instead of _. Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-rw-r--r--meta-microblaze/recipes-core/newlib/microblaze-newlib.inc2
-rw-r--r--meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc2
-rw-r--r--meta-microblaze/recipes-devtools/gcc/libgcc-common.inc4
-rw-r--r--meta-xilinx-bsp/conf/machine/include/board/ultra96.inc6
-rw-r--r--meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc2
-rw-r--r--meta-xilinx-pynq/classes/xilinx-pynq.bbclass2
-rw-r--r--meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb4
-rw-r--r--meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb4
-rw-r--r--meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb4
9 files changed, 15 insertions, 15 deletions
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index bc9b389c..f3ae4975 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -15,6 +15,6 @@ SRC_URI:append:microblaze = " \
15 file://0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch \ 15 file://0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch \
16 " 16 "
17 17
18EXTRA_OECONF_append_xilinx-standalone_microblaze = " \ 18EXTRA_OECONF:append_xilinx-standalone:microblaze = " \
19 --disable-newlib-reent-check-verify \ 19 --disable-newlib-reent-check-verify \
20" 20"
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc
index c9f12ab4..c78d5214 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers.inc
@@ -107,7 +107,7 @@ FILES:liblsan-dev += "\
107FILES:liblsan-staticdev += "${libdir}/liblsan.a" 107FILES:liblsan-staticdev += "${libdir}/liblsan.a"
108 108
109FILES:libtsan += "${libdir}/libtsan.so.*" 109FILES:libtsan += "${libdir}/libtsan.so.*"
110FILES_libtsan-dev += "\ 110FILES:libtsan-dev += "\
111 ${libdir}/libtsan.so \ 111 ${libdir}/libtsan.so \
112 ${libdir}/libtsan.la \ 112 ${libdir}/libtsan.la \
113 ${libdir}/libtsan_*.o \ 113 ${libdir}/libtsan_*.o \
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc
index 7c8a74d7..d48dc8b8 100644
--- a/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-common.inc
@@ -98,9 +98,9 @@ fakeroot python do_multilib_install() {
98 98
99 99
100 for ml in multilibs.split(): 100 for ml in multilibs.split():
101 tune = d.getVar('DEFAULTTUNE_virtclass-multilib-' + ml) 101 tune = d.getVar('DEFAULTTUNE:virtclass-multilib-' + ml)
102 if not tune: 102 if not tune:
103 bb.warn('DEFAULTTUNE_virtclass-multilib-%s is not defined. Skipping...' % ml) 103 bb.warn('DEFAULTTUNE:virtclass-multilib-%s is not defined. Skipping...' % ml)
104 continue 104 continue
105 105
106 tune_parameters = get_tune_parameters(tune, d) 106 tune_parameters = get_tune_parameters(tune, d)
diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
index d0ed510c..d028336a 100644
--- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
+++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
@@ -1,7 +1,7 @@
1# Ultra96 items that need to be configured from zynqmp-generic 1# Ultra96 items that need to be configured from zynqmp-generic
2PACKAGE_ARCH:pn-linux-xlnx_ultra96 = "${BOARDVARIANT_ARCH}" 2PACKAGE_ARCH:pn-linux-xlnx:ultra96 = "${BOARDVARIANT_ARCH}"
3KERNEL_DEVICETREE_ultra96 = "xilinx/zynqmp-zcu100-revC.dtb" 3KERNEL_DEVICETREE:ultra96 = "xilinx/zynqmp-zcu100-revC.dtb"
4 4
5# Enable bluetooth and wifi module 5# Enable bluetooth and wifi module
6MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append_ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x" 6MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
7 7
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index 5be0938e..53fe83b0 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -51,7 +51,7 @@ KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig"
51KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" 51KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig"
52KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" 52KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig"
53 53
54KERNEL_MODULE_AUTOLOAD_k26 += "usb5744" 54KERNEL_MODULE_AUTOLOAD:k26 += "usb5744"
55 55
56# MicroBlaze BSP fragments 56# MicroBlaze BSP fragments
57KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc" 57KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
diff --git a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
index 9110037a..3b40ac3c 100644
--- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
+++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
@@ -14,7 +14,7 @@ INSANE_SKIP:${PN} += "staticdev dev-so"
14inherit python3-dir 14inherit python3-dir
15 15
16# Used for setup.py on PYNQ 16# Used for setup.py on PYNQ
17BOARD_NAME_ultra96 = "Ultra96" 17BOARD_NAME:ultra96 = "Ultra96"
18BOARD_NAME_zcu104-zynqmp = "ZCU104" 18BOARD_NAME_zcu104-zynqmp = "ZCU104"
19 19
20do_compile:prepend() { 20do_compile:prepend() {
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
index a736d963..3fed5261 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
@@ -22,7 +22,7 @@ RDEPENDS:${PN}-notebooks += "\
22" 22"
23 23
24COMPATIBLE_MACHINE = "^$" 24COMPATIBLE_MACHINE = "^$"
25COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" 25COMPATIBLE_MACHINE:ultra96 = "${MACHINE}"
26 26
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
28 28
@@ -55,4 +55,4 @@ do_install () {
55 cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/ 55 cp -r ${S}/notebooks/* ${JUPYTER_NOTEBOOKS}/bnn_examples/
56} 56}
57 57
58PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" 58PACKAGE_ARCH:ultra96 = "${BOARD_ARCH}"
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
index 7ed5f8a2..f6febcc8 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \
15" 15"
16 16
17COMPATIBLE_MACHINE = "^$" 17COMPATIBLE_MACHINE = "^$"
18COMPATIBLE_MACHINE_ultra96 = "${MACHINE}" 18COMPATIBLE_MACHINE:ultra96 = "${MACHINE}"
19 19
20SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596" 20SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596"
21SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460" 21SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460"
@@ -37,4 +37,4 @@ do_install() {
37 37
38} 38}
39 39
40PACKAGE_ARCH_ultra96 = "${BOARD_ARCH}" 40PACKAGE_ARCH:ultra96 = "${BOARD_ARCH}"
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
index d01e5d7f..8da16452 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_git.bb
@@ -8,7 +8,7 @@ DEPENDS += "libxil xiltimer resetps"
8 8
9inherit python3native 9inherit python3native
10 10
11do_configure_prepend() { 11do_configure:prepend() {
12 cd ${S} 12 cd ${S}
13 lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} 13 lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
14 install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ 14 install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -36,4 +36,4 @@ do_deploy() {
36} 36}
37addtask deploy before do_build after do_package 37addtask deploy before do_build after do_package
38 38
39FILES_${PN} = "${base_libdir}/firmware/*.elf" 39FILES:${PN} = "${base_libdir}/firmware/*.elf"