From 78531e845ab5958519766c8bc42f8ef2271eeebc Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sun, 15 Jan 2023 08:25:25 -0800 Subject: xilinx-standalone.inc: Further sync with upstream disro settings Many of the settings/workaround have been replaced by changes in the upstream OE-Core tclibc-newlib. Additionally adding the DISTROVERRIDES with an append was potentially changing -native recipes hashes. Move this only where needed to avoid this behavior. Also sync settings with meta-petalinux, such as the buildhistory. This is now moved to the local.conf file. Signed-off-by: Mark Hatle --- .../conf/distro/xilinx-standalone-nolto.conf | 3 +++ meta-xilinx-standalone/conf/distro/xilinx-standalone.inc | 16 +--------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf index 315f555c..ccfd0600 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone-nolto.conf @@ -1 +1,4 @@ require conf/distro/xilinx-standalone.inc + +# Make sure any users get the xilinx-standalone distro override +DISTROOVERRIDES =. "xilinx-standalone:" diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc index ec490d26..4b51dd1b 100644 --- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc +++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc @@ -2,9 +2,6 @@ DISTRO_NAME = "Xilinx Standalone Distro" DISTRO_VERSION = "1.0" TARGET_VENDOR = "-xilinx" -# Make sure any users get the xilinx-standalone distro override -DISTROOVERRIDES:prepend = "${@'xilinx-standalone:' if d.getVar('DISTRO') != "xilinx-standalone" else ''}" - TCLIBC = "newlib" TCLIBCAPPEND ="" @@ -12,12 +9,10 @@ TCLIBCAPPEND ="" SDK_VERSION = "xilinx-standalone" # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian -LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" +LIBC_DEPENDENCIES:append:xilinx-standalone = " newlib-staticdev libgloss-staticdev" ESW_CFLAGS ?= "" -INHERIT += "buildhistory" - # Cortex R5 requires an additional cflag to be passed for compatibility with the embeddedsw TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', '', d)}" @@ -29,20 +24,11 @@ COMPATOS:class-target = ".*-linux${LIBCEXTENSION}${ABIEXTENSION}" COMPATIBLE_HOST ?= "${COMPATOS}" # Clear defaults -DISTRO_FEATURES_BACKFILL:xilinx-standalone = "" -VIRTUAL-RUNTIME_init_manager:xilinx-standalone = "" - PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" PREFERRED_VERSION_libmetal-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" PREFERRED_VERSION_open-amp-xlnx = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}" -# Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian -LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev" - -# No cached configsite files -TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" - # Workaround for pulling in nativesdk-mingw-w64-winpthreads TOOLCHAIN_HOST_TASK:append:sdkmingw32 = " nativesdk-mingw-w64-winpthreads" -- cgit v1.2.3-54-g00ecf