From c56f1380b4b49c9a463fa73ccb03618fa1008fd6 Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Fri, 2 Dec 2022 22:03:41 +0530 Subject: meta-xilinx-standalone-experimental: update recipes as per 2023.1 embeddedsw repo changes Update recipes and readme as per 2023.1 embeddedsw repo and as per latest lopper changes. Signed-off-by: Appana Durga Kedareswara rao Signed-off-by: Mark Hatle --- .../classes/esw.bbclass | 3 +++ .../conf/dtb-embeddedsw.inc | 7 ++++--- .../empty-application/empty-application_git.bb | 1 + .../freertos-hello-world_git.bb | 1 + .../freertos-lwip-echo-server_git.bb | 1 + .../freertos-lwip-tcp-perf-client_git.bb | 1 + .../freertos-lwip-tcp-perf-server_git.bb | 1 + .../freertos-lwip-udp-perf-client_git.bb | 1 + .../freertos-lwip-udp-perf-server_git.bb | 1 + .../hello-world/hello-world_git.bb | 1 + .../lwip-echo-server/lwip-echo-server_git.bb | 1 + .../lwip-tcp-perf-client_git.bb | 1 + .../lwip-tcp-perf-server_git.bb | 1 + .../lwip-udp-perf-client_git.bb | 1 + .../lwip-udp-perf-server_git.bb | 1 + .../memory-tests/memory-tests_git.bb | 1 + .../peripheral-tests/peripheral-tests_git.bb | 7 ++----- .../recipes-core/meta/files/README-setup | 24 +++++++++++----------- .../recipes-core/meta/files/dt-processor.sh | 20 +++++++++--------- .../recipes-libraries/xilmailbox_git.bb | 9 ++++++++ .../recipes-libraries/xilsecure_git.bb | 2 +- .../recipes-libraries/xilstandalone_git.bb | 2 +- 22 files changed, 56 insertions(+), 32 deletions(-) (limited to 'meta-xilinx-standalone-experimental') diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index 1fd3366e..42c9e4ac 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass @@ -78,6 +78,9 @@ cmake_do_generate_toolchain_file:append() { # Will need this in the future to make cmake understand esw variables # set( CMAKE_SYSTEM_NAME `echo elf | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` ) set( CMAKE_SYSTEM_NAME "${XLNX_CMAKE_SYSTEM_NAME}" ) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${S}/cmake) + set( CMAKE_EXPORT_COMPILE_COMMANDS ON) + set( CMAKE_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}) add_definitions( "${XLNX_CMAKE_BSP_VARS}" ) EOF } diff --git a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc index 2b461993..bcb35aba 100644 --- a/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc +++ b/meta-xilinx-standalone-experimental/conf/dtb-embeddedsw.inc @@ -4,9 +4,10 @@ # Make it clear decoupling is 'experimental' in the version ESW_VER = "experimental" -REPO = "git://github.com/Xilinx/embeddedsw-experimental-dt-support.git;protocol=https" +REPO = "git://gitenterprise.xilinx.com/decoupling/embeddedsw-experimental-dt-support.git;protocol=https" -ESW_BRANCH[experimental] = "xlnx_rel_v2022.1_sdt_experimental_beta" -ESW_REV[experimental] = "2f93defe078000965c8f7203da11817c9f0982d1" +ESW_BRANCH[experimental] = "xlnx_rel_v2023.1_sdt_experimental" +ESW_REV[experimental] = "9d4f60b714513da97b93d89a22f59e95f580b52e" LIC_FILES_CHKSUM[master] = '7c92de7a21a6613265035c28f4a92f48' LIC_FILES_CHKSUM[xlnx_rel_v2022.1_sdt_experimental_beta] = 'e26f53a7d6f58f4b1a9687099417225c' +LIC_FILES_CHKSUM[xlnx_rel_v2023.1_sdt_experimental] = 'ce611484168a6000bd35df68fc4f4290' diff --git a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb index 8ffb01cb..f7257864 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb @@ -13,6 +13,7 @@ do_configure:prepend() { install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ install -m 0644 ${CUSTOM_SRCFILE}/* ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb index f97240f8..d5af2b17 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb index 5e58c601..1fd29af8 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb index e4a2b041..b4264c64 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb index bf892954..69c9149e 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb index 0a28d3df..e39d5dbe 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb index 0212dab2..12f8e799 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb index 16d9d030..36263407 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb @@ -12,6 +12,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb index 84909f18..b59f3b37 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb index eea50f60..ac8c7c7f 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb index fac6ace0..144a0fdc 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb index 0c1b1f9b..05bb1013 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb index 8973ee60..d2b4e0f5 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb @@ -10,6 +10,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb index f2af00f6..cfae1ba4 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb @@ -12,6 +12,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } diff --git a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb index 21422739..d2e5a5b7 100644 --- a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb @@ -12,6 +12,7 @@ do_configure:prepend() { lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/ install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + cp -rf ${S}/scripts/linker_files/ ${S}/${ESW_COMPONENT_SRC}/linker_files ) } @@ -30,12 +31,8 @@ python do_generate_app_data() { bb.error("Couldn't find source dir %s" % d.getVar('OECMAKE_SOURCEPATH')) driver_name = d.getVar('REQUIRED_DISTRO_FEATURES') - command = ["lopper"] + ["-f"] + [system_dt[0]] + ["--"] + ["baremetal_gentestapp_xlnx"] + [machine] + [srcdir[0]] + command = ["lopper"] + ["-f"] + ["-O"] + [src_dir[0]] + [system_dt[0]] + ["--"] + ["baremetal_gentestapp_xlnx"] + [machine] + [srcdir[0]] subprocess.run(command, check = True) - with open("file_list.txt", 'r') as fd: - for line in fd: - command = ["install"] + ["-m"] + ["0755"] + [line.strip()] + [src_dir[0]] - subprocess.run(command, check = True) } addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot do_prepare_recipe_sysroot[rdeptask] = "do_unpack" diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup index 88046966..eb2db98b 100644 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup @@ -46,16 +46,16 @@ To enable this, add the following to your local.conf: BASE_TMPDIR = "${TOPDIR}" require conf/cortexa53-zynqmp-linux.conf SYSTEM_DTFILE = "/proj/yocto/zu_sdt/system-top.dts" -BBMULTICONFIG += " cortexa53-zynqmp-fsbl-baremetal cortexa53-zynqmp-baremetal cortexa53-zynqmp-freertos cortexr5-zynqmp-fsbl-baremetal cortexr5-zynqmp-baremetal cortexr5-zynqmp-freertos microblaze-pmu" +BBMULTICONFIG += " cortexa53-0-zynqmp-fsbl-baremetal cortexa53-0-zynqmp-baremetal cortexa53-0-zynqmp-freertos cortexa53-1-zynqmp-baremetal cortexa53-1-zynqmp-freertos cortexa53-2-zynqmp-baremetal cortexa53-2-zynqmp-freertos cortexa53-3-zynqmp-baremetal cortexa53-3-zynqmp-freertos cortexr5-0-zynqmp-fsbl-baremetal cortexr5-0-zynqmp-baremetal cortexr5-0-zynqmp-freertos cortexr5-1-zynqmp-baremetal cortexr5-1-zynqmp-freertos microblaze-0-pmu" FSBL_DEPENDS = "" -FSBL_MCDEPENDS = "mc::cortexa53-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy" -FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}" +FSBL_MCDEPENDS = "mc::cortexa53-0-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy" +FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexa53-0-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}" R5FSBL_DEPENDS = "" -R5FSBL_MCDEPENDS = "mc::cortexr5-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy" -R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}" +R5FSBL_MCDEPENDS = "mc::cortexr5-0-zynqmp-fsbl-baremetal:fsbl-firmware:do_deploy" +R5FSBL_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-cortexr5-0-zynqmp-fsbl-baremetal/deploy/images/${MACHINE}" PMU_DEPENDS = "" -PMU_MCDEPENDS = "mc::microblaze-pmu:pmu-firmware:do_deploy" -PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MACHINE}" +PMU_MCDEPENDS = "mc::microblaze-0-pmu:pmu-firmware:do_deploy" +PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-pmu/deploy/images/${MACHINE}" # # OR @@ -72,13 +72,13 @@ To enable this, add the following to your local.conf: BASE_TMPDIR = "${TOPDIR}" require conf/cortexa72-versal-linux.conf SYSTEM_DTFILE = "/proj/yocto/mhatle/DTB-FLOW/testing/vck190-sdt/system-top.dts" -BBMULTICONFIG += " cortexa72-versal-baremetal cortexa72-versal-freertos microblaze-pmc microblaze-psm cortexr5-versal-baremetal cortexr5-versal-freertos" +BBMULTICONFIG += " cortexa72-0-versal-baremetal cortexa72-0-versal-freertos cortexa72-1-versal-baremetal cortexa72-1-versal-freertos microblaze-0-pmc microblaze-0-psm cortexr5-0-versal-baremetal cortexr5-0-versal-freertos cortexr5-1-versal-baremetal cortexr5-1-versal-freertos" PLM_DEPENDS = "" -PLM_MCDEPENDS = "mc::microblaze-pmc:plm-firmware:do_deploy" -PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmc/deploy/images/${MACHINE}" +PLM_MCDEPENDS = "mc::microblaze-0-pmc:plm-firmware:do_deploy" +PLM_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-pmc/deploy/images/${MACHINE}" PSM_DEPENDS = "" -PSM_MCDEPENDS = "mc::microblaze-psm:psm-firmware:do_deploy" -PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-psm/deploy/images/${MACHINE}" +PSM_MCDEPENDS = "mc::microblaze-0-psm:psm-firmware:do_deploy" +PSM_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-0-psm/deploy/images/${MACHINE}" PDI_PATH = "__PATH TO PDI FILE HERE__" # NOTE: On versal, you MUST specify the PDI file as directed by the instructions. diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh index 02b4466b..ce41096c 100755 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh @@ -275,7 +275,7 @@ cortex_a53_freertos() { suffix="" [ "$1" != "None" ] && suffix="-$1" - dtb_file="cortexa53-${machine}${suffix}-freertos.dtb" + dtb_file="cortexa53-$2-${machine}${suffix}-freertos.dtb" multiconf="${multiconf} cortexa53-$2-${machine}${suffix}-freertos" conf_file="multiconfig/cortexa53-$2-${machine}${suffix}-freertos.conf" libxil="multiconfig/includes/cortexa53-${machine}${suffix}-libxil.conf" @@ -692,9 +692,9 @@ pmu-microblaze() { process_microblaze - dtb_file="microblaze-pmu.dtb" - multiconf="${multiconf} microblaze-pmu" - conf_file="multiconfig/microblaze-pmu.conf" + dtb_file="microblaze-0-pmu.dtb" + multiconf="${multiconf} microblaze-0-pmu" + conf_file="multiconfig/microblaze-0-pmu.conf" libxil="multiconfig/includes/microblaze-pmu-libxil.conf" distro="multiconfig/includes/microblaze-pmu-distro.conf" @@ -750,9 +750,9 @@ pmc-microblaze() { process_microblaze - dtb_file="microblaze-pmc.dtb" - multiconf="${multiconf} microblaze-pmc" - conf_file="multiconfig/microblaze-pmc.conf" + dtb_file="microblaze-0-pmc.dtb" + multiconf="${multiconf} microblaze-0-pmc" + conf_file="multiconfig/microblaze-0-pmc.conf" libxil="multiconfig/includes/microblaze-pmc-libxil.conf" distro="multiconfig/includes/microblaze-pmc-distro.conf" @@ -808,9 +808,9 @@ psm-microblaze() { process_microblaze - dtb_file="microblaze-psm.dtb" - multiconf="${multiconf} microblaze-psm" - conf_file="multiconfig/microblaze-psm.conf" + dtb_file="microblaze-0-psm.dtb" + multiconf="${multiconf} microblaze-0-psm" + conf_file="multiconfig/microblaze-0-psm.conf" libxil="multiconfig/includes/microblaze-psm-libxil.conf" distro="multiconfig/includes/microblaze-psm-distro.conf" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb index 50dbc776..77115515 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox_git.bb @@ -4,3 +4,12 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/src/" ESW_COMPONENT_NAME = "libxilmailbox.a" DEPENDS += "xilstandalone libxil xiltimer" + +do_configure:prepend() { + # This script should also not rely on relative paths and such + ( + cd ${S} + lopper ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S} + install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + ) +} diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb index b8c57eba..cb461024 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure_git.bb @@ -3,4 +3,4 @@ inherit esw ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/" ESW_COMPONENT_NAME = "libxilsecure.a" -DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'ub1_cpu_pmc' else 'xilmailbox'}" +DEPENDS += "libxil xiltimer ${@'xilplmi' if d.getVar('ESW_MACHINE') == 'ub1_cpu_pmc' else ''} ${@'xilmailbox' if d.getVar('MACHINE') == 'versal-generic' and d.getVar('ESW_MACHINE') != 'ub1_cpu_pmc' else ''}" diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb index 70a46c5e..a34ad964 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb @@ -11,6 +11,6 @@ do_configure:prepend() { cd ${S} lopper ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} install -m 0755 MemConfig.cmake ${S}/${ESW_COMPONENT_SRC}/ - install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC}/common/ + install -m 0755 *.c ${S}/${ESW_COMPONENT_SRC} ) } -- cgit v1.2.3-54-g00ecf