From 4539ea952092c96dd7c8dece1524a93c340920d9 Mon Sep 17 00:00:00 2001 From: Appana Durga Kedareswara rao Date: Wed, 18 Oct 2023 15:54:07 +0530 Subject: meta-xilinx-standalone-experimental: Update recipes as per unified embeddedsw sources In the unified repo few driver recipes are depends on xparamters.h file so move the xparameters.h generation to xilstandalone recipe and update other recipes as per latest sources. Signed-off-by: Appana Durga Kedareswara rao Signed-off-by: Mark Hatle --- meta-xilinx-standalone-experimental/classes/esw.bbclass | 5 +++-- .../classes/esw_examples.bbclass | 1 + .../recipes-drivers/clockps_git.bb | 3 +++ .../recipes-drivers/common_git.bb | 6 ++++-- .../recipes-libraries/libxil_git.bb | 10 +++++----- .../recipes-libraries/xilplmi_git.bb | 2 +- .../recipes-libraries/xilsecure_git.bb | 4 ++++ .../recipes-libraries/xilstandalone_git.bb | 3 +++ 8 files changed, 24 insertions(+), 10 deletions(-) diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass index febdebad..a597a81c 100644 --- a/meta-xilinx-standalone-experimental/classes/esw.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass @@ -80,11 +80,11 @@ cmake_do_generate_toolchain_file:append() { # 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_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR}) + set( CMAKE_LIBRARY_PATH ${B}) if ("${XLNX_CMAKE_PROCESSOR}" STREQUAL "plm_microblaze") set( CMAKE_BUILD_TYPE Release) endif() - add_definitions( "${XLNX_CMAKE_BSP_VARS}" ) + add_definitions( "${XLNX_CMAKE_BSP_VARS} -DSDT" ) EOF } @@ -96,6 +96,7 @@ do_install() { } CFLAGS:append = " ${ESW_CFLAGS}" +EXTRA_OECMAKE += "-DYOCTO=ON" # We need to find the license file, which vaires depending on the component # recurse a maximum of x times, could be fancier but it gets complicated since diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass index 43e78191..9a94f3cd 100644 --- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass +++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass @@ -7,6 +7,7 @@ do_configure:prepend() { cd ${S} lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${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-drivers/clockps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb index 4bddb2c0..3a464480 100644 --- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-drivers/clockps_git.bb @@ -8,3 +8,6 @@ DEPENDS += "xilstandalone " ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clockps/src/" ESW_COMPONENT_NAME = "libclockps.a" + +addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot +do_prepare_recipe_sysroot[rdeptask] = "do_unpack" diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb index 541ff225..40d2a1ae 100644 --- a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb @@ -13,11 +13,13 @@ PACKAGECONFIG[clockps] = "${RECIPE_SYSROOT}/usr/lib/libclockps.a,,clockps,," PACKAGECONFIG[scugic] = "${RECIPE_SYSROOT}/usr/lib/libscugic.a,,scugic,," PACKAGECONFIG[intc] = "${RECIPE_SYSROOT}/usr/lib/libintc.a,,intc,," -ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/common/src/" +ESW_COMPONENT_SRC = "/lib/bsp/standalone/src/common/intr/" ESW_COMPONENT_NAME = "libcommon.a" do_configure:prepend() { LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/intc/src/ LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/scugic/src/ - install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + if [ -f *.cmake ]; then + install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/ + fi } diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb index 2ec1d6cd..8f33c848 100644 --- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb +++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb @@ -28,11 +28,6 @@ DEPENDS += "xilstandalone " REQUIRED_MACHINE_FEATURES = "${MACHINE_FEATURES}" PACKAGECONFIG ?= "${MACHINE_FEATURES}" -do_configure:prepend() { - LOPPER_DTC_FLAGS="-b 0 -@" lopper ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S} - install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/ -} - do_compile() { # Combines the .a archives produced by all of the dependent items cd ${RECIPE_SYSROOT}/usr/lib/ @@ -48,3 +43,8 @@ do_compile() { ${AR} -M