summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-10-14 11:41:47 -0700
committerMark Hatle <mark.hatle@xilinx.com>2021-10-25 14:57:25 -0700
commitd88f5d53d1471443f3ee5f9899177598d2dc156b (patch)
tree72f7a91bd47ab4b12e70f7d3ef4e68d5bdeba0bf
parentbe068fec4927666ad84f8955b8cf65e9e25e837f (diff)
downloadmeta-xilinx-d88f5d53d1471443f3ee5f9899177598d2dc156b.tar.gz
meta-xilinx-standalone-experimental: various fixes for override syntax changes
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-standalone-experimental/classes/esw.bbclass6
-rw-r--r--meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb1
-rw-r--r--meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb4
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)}"
65XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}" 65XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('ESW_MACHINE'), d)}"
66XLNX_CMAKE_SYSTEM_NAME ?= "Generic" 66XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
67 67
68cmake_do_generate_toolchain_file_append() { 68cmake_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
34EXCLUDE_FROM_WORLD = "1" 34EXCLUDE_FROM_WORLD = "1"
35 35
36inherit meta
37inherit populate_sdk 36inherit populate_sdk
38inherit toolchain-scripts-base 37inherit toolchain-scripts-base
39inherit nopackages 38inherit 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/"
4ESW_COMPONENT_NAME = "liblwip211.a" 4ESW_COMPONENT_NAME = "liblwip211.a"
5 5
6DEPENDS += "libxil" 6DEPENDS += "libxil"
7DEPENDS:append_xilinx-freertos = "freertos10-xilinx" 7DEPENDS:append:xilinx-freertos = "freertos10-xilinx"
8 8
9EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API" 9EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API"
10EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON" 10EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
11EXTRA_OECMAKE += "-Dlwip_dhcp=ON" 11EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
12EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048" 12EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
13EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF" 13EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
14EXTRA_OECMAKE:append_xilinx-freertos += "-Dlwip_api_mode=SOCKET_API" 14EXTRA_OECMAKE:append:xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
15 15
16do_configure:prepend() { 16do_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