diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-14 11:41:47 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-10-25 14:57:25 -0700 |
commit | d88f5d53d1471443f3ee5f9899177598d2dc156b (patch) | |
tree | 72f7a91bd47ab4b12e70f7d3ef4e68d5bdeba0bf | |
parent | be068fec4927666ad84f8955b8cf65e9e25e837f (diff) | |
download | meta-xilinx-d88f5d53d1471443f3ee5f9899177598d2dc156b.tar.gz |
meta-xilinx-standalone-experimental: various fixes for override syntax changes
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
3 files changed, 5 insertions, 6 deletions
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index f95dc692..9169bbe9 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass | |||
@@ -46,9 +46,9 @@ def get_xlnx_cmake_processor(tune, machine, d): | |||
46 | cmake_processor = tune | 46 | cmake_processor = tune |
47 | if tune.startswith('microblaze'): | 47 | if tune.startswith('microblaze'): |
48 | if (machine == 'microblaze-pmu'): | 48 | if (machine == 'microblaze-pmu'): |
49 | cmake_processor = 'pmu:microblaze' | 49 | cmake_processor = 'pmu_microblaze' |
50 | elif (machine == 'microblaze-plm'): | 50 | elif (machine == 'microblaze-plm'): |
51 | cmake_processor = 'plm:microblaze' | 51 | cmake_processor = 'plm_microblaze' |
52 | else: | 52 | else: |
53 | cmake_processor = 'microblaze' | 53 | cmake_processor = 'microblaze' |
54 | elif (tune in [ 'cortexr5', 'cortexr5f' ]): | 54 | elif (tune in [ 'cortexr5', 'cortexr5f' ]): |
@@ -65,7 +65,7 @@ XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}" | |||
65 | XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}" | 65 | XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}" |
66 | XLNX_CMAKE_SYSTEM_NAME ?= "Generic" | 66 | XLNX_CMAKE_SYSTEM_NAME ?= "Generic" |
67 | 67 | ||
68 | cmake_do_generate_toolchain_file_append() { | 68 | cmake_do_generate_toolchain_file:append() { |
69 | cat >> ${WORKDIR}/toolchain.cmake <<EOF | 69 | cat >> ${WORKDIR}/toolchain.cmake <<EOF |
70 | include(CMakeForceCompiler) | 70 | include(CMakeForceCompiler) |
71 | CMAKE_FORCE_C_COMPILER("${OECMAKE_C_COMPILER}" GNU) | 71 | CMAKE_FORCE_C_COMPILER("${OECMAKE_C_COMPILER}" GNU) |
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb index a2e0d364..79905ed4 100644 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb | |||
@@ -33,7 +33,6 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}" | |||
33 | 33 | ||
34 | EXCLUDE_FROM_WORLD = "1" | 34 | EXCLUDE_FROM_WORLD = "1" |
35 | 35 | ||
36 | inherit meta | ||
37 | inherit populate_sdk | 36 | inherit populate_sdk |
38 | inherit toolchain-scripts-base | 37 | inherit toolchain-scripts-base |
39 | inherit nopackages | 38 | inherit nopackages |
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb index 11e44c28..554e2636 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb | |||
@@ -4,14 +4,14 @@ ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/" | |||
4 | ESW_COMPONENT_NAME = "liblwip211.a" | 4 | ESW_COMPONENT_NAME = "liblwip211.a" |
5 | 5 | ||
6 | DEPENDS += "libxil" | 6 | DEPENDS += "libxil" |
7 | DEPENDS:append_xilinx-freertos = "freertos10-xilinx" | 7 | DEPENDS:append:xilinx-freertos = "freertos10-xilinx" |
8 | 8 | ||
9 | EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API" | 9 | EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API" |
10 | EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON" | 10 | EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON" |
11 | EXTRA_OECMAKE += "-Dlwip_dhcp=ON" | 11 | EXTRA_OECMAKE += "-Dlwip_dhcp=ON" |
12 | EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048" | 12 | EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048" |
13 | EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF" | 13 | EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF" |
14 | EXTRA_OECMAKE:append_xilinx-freertos += "-Dlwip_api_mode=SOCKET_API" | 14 | EXTRA_OECMAKE:append:xilinx-freertos += "-Dlwip_api_mode=SOCKET_API" |
15 | 15 | ||
16 | do_configure:prepend() { | 16 | do_configure:prepend() { |
17 | # This script should also not rely on relative paths and such | 17 | # This script should also not rely on relative paths and such |