Ensure that each bbappend only applies when XILINX_WITH_ESW or a related DISTRO is enabled.
Signed-off-by: Mark Hatle <[email protected]> --- .../device-tree-meta-xilinx-standalone.inc | 7 +++++ .../device-tree/device-tree.bbappend | 10 ++----- .../fsbl-meta-xilinx-standalone.inc | 18 ++++++++++++ .../recipes-bsp/embeddedsw/fsbl.bbappend | 19 +------------ .../plmfw-meta-xilinx-standalone.inc | 26 +++++++++++++++++ .../recipes-bsp/embeddedsw/plmfw.bbappend | 27 +----------------- .../pmufw-meta-xilinx-standalone.inc | 26 +++++++++++++++++ .../recipes-bsp/embeddedsw/pmufw.bbappend | 27 +----------------- .../psmfw-meta-xilinx-standalone.inc | 27 ++++++++++++++++++ .../recipes-bsp/embeddedsw/psmfw.bbappend | 28 +------------------ .../recipes-core/meta/meta-toolchain.bbappend | 2 +- .../recipes-core/newlib/libgloss_%.bbappend | 4 +-- .../recipes-core/newlib/newlib_%.bbappend | 4 +-- .../binutils/binutils-xilinx-standalone.inc | 4 +-- .../gcc/gcc-configure-xilinx-standalone.inc | 4 +-- .../gcc/gcc-runtime_%.bbappend | 18 ++++++------ .../gcc/gcc-source_%.bbappend | 2 +- .../gcc/gcc-xilinx-standalone.inc | 8 +++--- .../recipes-devtools/gcc/libgcc_%.bbappend | 2 +- .../qemu/qemuwrapper-cross_1.0.bbappend | 2 +- .../recipes-kernel/linux/linux-dummy.bbappend | 2 +- 21 files changed, 136 insertions(+), 131 deletions(-) create mode 100644 meta-xilinx-standalone/recipes-bsp/device-tree/device-tree-meta-xilinx-standalone.inc create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-meta-xilinx-standalone.inc create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw-meta-xilinx-standalone.inc create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw-meta-xilinx-standalone.inc create mode 100644 meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw-meta-xilinx-standalone.inc diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree-meta-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree-meta-xilinx-standalone.inc new file mode 100644 index 00000000..b059ae33 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree-meta-xilinx-standalone.inc @@ -0,0 +1,7 @@ +COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*" +COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*" +COMPATIBLE_MACHINE:microblaze-pmu = ".*" +COMPATIBLE_MACHINE:microblaze-plm = ".*" +COMPATIBLE_MACHINE:cortexa72-versal = ".*" +COMPATIBLE_MACHINE:cortexr5-versal = ".*" +COMPATIBLE_MACHINE:cortexa9-zynq = ".*" diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend index c1658042..6b576ec5 100644 --- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend @@ -1,14 +1,8 @@ +include ${@'device-tree-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''} + COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" COMPATIBLE_HOST:xilinx-freertos = "${HOST_SYS}" -COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*" -COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*" -COMPATIBLE_MACHINE:microblaze-pmu = ".*" -COMPATIBLE_MACHINE:microblaze-plm = ".*" -COMPATIBLE_MACHINE:cortexa72-versal = ".*" -COMPATIBLE_MACHINE:cortexr5-versal = ".*" -COMPATIBLE_MACHINE:cortexa9-zynq = ".*" - # Enable @ flag on dtc which is required by libxil DTC_FLAGS:append:xilinx-standalone = " -@" DT_INCLUDE:append:xilinx-standalone = " ${UNPACKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-meta-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-meta-xilinx-standalone.inc new file mode 100644 index 00000000..4507a0c7 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-meta-xilinx-standalone.inc @@ -0,0 +1,18 @@ +# Include the fsbl-fw setting, if it's enabled +FSBL_INC = "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'fsbl-fw-cfg.inc', '', d)}" +require ${FSBL_INC} + +def check_fsbl_variables(d): + # If both are blank, the user MUST pass in the path to the firmware! + if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS'): + # Don't cache this, as the items on disk can change! + d.setVar('BB_DONT_CACHE', '1') + + if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"): + if not d.getVar('WITHIN_EXT_SDK'): + raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nSet FSBL_FILE to the path with a precompiled FSBL binary or you may need to enable BBMULTICONFIG += 'fsbl-fw' to generate it." % d.getVar('FSBL_FILE')) + else: + # We found the file, so be sure to track it + d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf') + d.setVarFlag('do_install', 'file-checksums', '${FSBL_FILE}.elf:True') + d.setVarFlag('do_deploy', 'file-checksums', '${FSBL_FILE}.elf:True') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend index 4507a0c7..17fd25ea 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend @@ -1,18 +1 @@ -# Include the fsbl-fw setting, if it's enabled -FSBL_INC = "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'fsbl-fw-cfg.inc', '', d)}" -require ${FSBL_INC} - -def check_fsbl_variables(d): - # If both are blank, the user MUST pass in the path to the firmware! - if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS'): - # Don't cache this, as the items on disk can change! - d.setVar('BB_DONT_CACHE', '1') - - if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"): - if not d.getVar('WITHIN_EXT_SDK'): - raise bb.parse.SkipRecipe("The expect file %s.elf is not available.\nSet FSBL_FILE to the path with a precompiled FSBL binary or you may need to enable BBMULTICONFIG += 'fsbl-fw' to generate it." % d.getVar('FSBL_FILE')) - else: - # We found the file, so be sure to track it - d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf') - d.setVarFlag('do_install', 'file-checksums', '${FSBL_FILE}.elf:True') - d.setVarFlag('do_deploy', 'file-checksums', '${FSBL_FILE}.elf:True') +include ${@'fsbl-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw-meta-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw-meta-xilinx-standalone.inc new file mode 100644 index 00000000..49c897e1 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw-meta-xilinx-standalone.inc @@ -0,0 +1,26 @@ +# Include the versal-fw setting, if it's enabled +PLMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}" +require ${PLMFW_INC} + +def check_plm_vars(d): + # If both are blank, the user MUST pass in the path to the firmware! + if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS'): + # Don't cache this, as the items on disk can change! + d.setVar('BB_DONT_CACHE', '1') + + msg = "" + fail = False + if not os.path.exists(d.getVar('PLM_FILE') + ".elf"): + msg = msg + "The expected file %s.elf is not available. " % d.getVar('PLM_FILE') + fail = True + if not os.path.exists(d.getVar('PLM_FILE') + ".bin"): + msg = msg + "The expected file %s.bin is not available. " % d.getVar('PLM_FILE') + fail = True + if fail: + if not d.getVar('WITHIN_EXT_SDK'): + raise bb.parse.SkipRecipe("%s\nEither specify PLM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg) + else: + # We found the file, so be sure to track it + d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin') + d.setVarFlag('do_install', 'file-checksums', '${PLM_FILE}.elf:True') + d.setVarFlag('do_deploy', 'file-checksums', '${PLM_FILE}.elf:True ${PLM_FILE}.bin:True') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend index 49c897e1..e55c23b2 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend @@ -1,26 +1 @@ -# Include the versal-fw setting, if it's enabled -PLMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}" -require ${PLMFW_INC} - -def check_plm_vars(d): - # If both are blank, the user MUST pass in the path to the firmware! - if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS'): - # Don't cache this, as the items on disk can change! - d.setVar('BB_DONT_CACHE', '1') - - msg = "" - fail = False - if not os.path.exists(d.getVar('PLM_FILE') + ".elf"): - msg = msg + "The expected file %s.elf is not available. " % d.getVar('PLM_FILE') - fail = True - if not os.path.exists(d.getVar('PLM_FILE') + ".bin"): - msg = msg + "The expected file %s.bin is not available. " % d.getVar('PLM_FILE') - fail = True - if fail: - if not d.getVar('WITHIN_EXT_SDK'): - raise bb.parse.SkipRecipe("%s\nEither specify PLM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg) - else: - # We found the file, so be sure to track it - d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin') - d.setVarFlag('do_install', 'file-checksums', '${PLM_FILE}.elf:True') - d.setVarFlag('do_deploy', 'file-checksums', '${PLM_FILE}.elf:True ${PLM_FILE}.bin:True') +include ${@'plmfw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw-meta-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw-meta-xilinx-standalone.inc new file mode 100644 index 00000000..241da1d0 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw-meta-xilinx-standalone.inc @@ -0,0 +1,26 @@ +# Include the zynqmp-pmufw setting, if it's enabled +PMUFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'zynqmp-pmufw-cfg.inc', '', d)}" +require ${PMUFW_INC} + +def check_pmu_vars(d): + # If both are blank, the user MUST pass in the path to the firmware! + if not d.getVar('PMU_DEPENDS') and not d.getVar('PMU_MCDEPENDS'): + # Don't cache this, as the items on disk can change! + d.setVar('BB_DONT_CACHE', '1') + + msg = "" + fail = False + if not os.path.exists(d.getVar('PMU_FILE') + ".elf"): + msg = msg + "The expected file %s.elf is not available. " % d.getVar('PMU_FILE') + fail = True + if not os.path.exists(d.getVar('PMU_FILE') + ".bin"): + msg = msg + "The expected file %s.bin is not available. " % d.getVar('PMU_FILE') + fail = True + if fail: + if not d.getVar('WITHIN_EXT_SDK'): + raise bb.parse.SkipRecipe("%s\nEither specify PMU_FILE, or you may need to enable BBMULTICONFIG += 'zynqmp-pmufw' to generate it." % msg) + else: + # We found the file, so be sure to track it + d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin') + d.setVarFlag('do_install', 'file-checksums', '${PMU_FILE}.elf:True') + d.setVarFlag('do_deploy', 'file-checksums', '${PMU_FILE}.elf:True ${PMU_FILE}.bin:True') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend index 241da1d0..ce659447 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend @@ -1,26 +1 @@ -# Include the zynqmp-pmufw setting, if it's enabled -PMUFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'zynqmp-pmufw-cfg.inc', '', d)}" -require ${PMUFW_INC} - -def check_pmu_vars(d): - # If both are blank, the user MUST pass in the path to the firmware! - if not d.getVar('PMU_DEPENDS') and not d.getVar('PMU_MCDEPENDS'): - # Don't cache this, as the items on disk can change! - d.setVar('BB_DONT_CACHE', '1') - - msg = "" - fail = False - if not os.path.exists(d.getVar('PMU_FILE') + ".elf"): - msg = msg + "The expected file %s.elf is not available. " % d.getVar('PMU_FILE') - fail = True - if not os.path.exists(d.getVar('PMU_FILE') + ".bin"): - msg = msg + "The expected file %s.bin is not available. " % d.getVar('PMU_FILE') - fail = True - if fail: - if not d.getVar('WITHIN_EXT_SDK'): - raise bb.parse.SkipRecipe("%s\nEither specify PMU_FILE, or you may need to enable BBMULTICONFIG += 'zynqmp-pmufw' to generate it." % msg) - else: - # We found the file, so be sure to track it - d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin') - d.setVarFlag('do_install', 'file-checksums', '${PMU_FILE}.elf:True') - d.setVarFlag('do_deploy', 'file-checksums', '${PMU_FILE}.elf:True ${PMU_FILE}.bin:True') +include ${@'pmufw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''} diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw-meta-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw-meta-xilinx-standalone.inc new file mode 100644 index 00000000..dc7c6df6 --- /dev/null +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw-meta-xilinx-standalone.inc @@ -0,0 +1,27 @@ +# Include the versal-fw setting, if it's enabled +PSMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}" +require ${PSMFW_INC} + +def check_psm_vars(d): + # If both are blank, the user MUST pass in the path to the firmware! + if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS'): + # Don't cache this, as the items on disk can change! + d.setVar('BB_DONT_CACHE', '1') + + msg = "" + fail = False + if not os.path.exists(d.getVar('PSM_FILE') + ".elf"): + msg = msg + "The expected file %s.elf is not available. " % d.getVar('PSM_FILE') + fail = True + if not os.path.exists(d.getVar('PSM_FILE') + ".bin"): + msg = msg + "The expected file %s.bin is not available. " % d.getVar('PSM_FILE') + fail = True + + if fail: + if not d.getVar('WITHIN_EXT_SDK'): + raise bb.parse.SkipRecipe("%s\nEither specify PSM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg) + else: + # We found the file, so be sure to track it + d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin') + d.setVarFlag('do_install', 'file-checksums', '${PSM_FILE}.elf:True') + d.setVarFlag('do_deploy', 'file-checksums', '${PSM_FILE}.elf:True ${PSM_FILE}.bin:True') diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend index dc7c6df6..559d179c 100644 --- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend +++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend @@ -1,27 +1 @@ -# Include the versal-fw setting, if it's enabled -PSMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}" -require ${PSMFW_INC} - -def check_psm_vars(d): - # If both are blank, the user MUST pass in the path to the firmware! - if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS'): - # Don't cache this, as the items on disk can change! - d.setVar('BB_DONT_CACHE', '1') - - msg = "" - fail = False - if not os.path.exists(d.getVar('PSM_FILE') + ".elf"): - msg = msg + "The expected file %s.elf is not available. " % d.getVar('PSM_FILE') - fail = True - if not os.path.exists(d.getVar('PSM_FILE') + ".bin"): - msg = msg + "The expected file %s.bin is not available. " % d.getVar('PSM_FILE') - fail = True - - if fail: - if not d.getVar('WITHIN_EXT_SDK'): - raise bb.parse.SkipRecipe("%s\nEither specify PSM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg) - else: - # We found the file, so be sure to track it - d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin') - d.setVarFlag('do_install', 'file-checksums', '${PSM_FILE}.elf:True') - d.setVarFlag('do_deploy', 'file-checksums', '${PSM_FILE}.elf:True ${PSM_FILE}.bin:True') +include ${@'psmfw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''} diff --git a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend index 0d824324..3fc7a89f 100644 --- a/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend +++ b/meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend @@ -1 +1 @@ -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_%.bbappend index fcdc1ebd..086762ba 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_%.bbappend @@ -1,5 +1,5 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" +COMPATIBLE_HOST:xilinx-standalone = ".*-elf" +COMPATIBLE_HOST:arm:xilinx-standalone = "[^-]*-[^-]*-eabi" EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_%.bbappend index aff092cc..716ba746 100644 --- a/meta-xilinx-standalone/recipes-core/newlib/newlib_%.bbappend +++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_%.bbappend @@ -1,5 +1,5 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" +COMPATIBLE_HOST:xilinx-standalone = ".*-elf" +COMPATIBLE_HOST:arm:xilinx-standalone = "[^-]*-[^-]*-eabi" EXTRA_OECONF:append:xilinx-standalone = " \ --enable-newlib-io-c99-formats \ diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc index 48db3cf3..a6581b69 100644 --- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc @@ -9,11 +9,11 @@ EXTRA_OECONF:append:xilinx-standalone = " \ " # CortexR5 and 32-bit arm are both "arm" -EXTRA_OECONF:append:xilinx-standalone:arm = " \ +EXTRA_OECONF:append:arm:xilinx-standalone = " \ --enable-interwork \ " -EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ +EXTRA_OECONF:append:microblaze:xilinx-standalone = " \ --disable-initfini-array \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc index 0320a780..53bca733 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc @@ -2,6 +2,6 @@ LINKER_HASH_STYLE:xilinx-standalone = "" SYMVERS_CONF:xilinx-standalone = "" -EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-initfini_array" +EXTRA_OECONF:append:microblaze:xilinx-standalone = " --disable-initfini_array" -EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-__cxa_atexit" +EXTRA_OECONF:append:microblaze:xilinx-standalone = " --disable-__cxa_atexit" diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index 52360e2b..d9c4ad18 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend @@ -1,8 +1,8 @@ require gcc-configure-xilinx-standalone.inc -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" -EXTRA_OECONF:append:xilinx-standalone:class-target = " \ +EXTRA_OECONF:append:class-target:xilinx-standalone = " \ --disable-libstdcxx-pch \ --with-newlib \ --disable-threads \ @@ -11,22 +11,22 @@ EXTRA_OECONF:append:xilinx-standalone:class-target = " \ --disable-libitm \ " -EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ +EXTRA_OECONF:append:aarch64:class-target:xilinx-standalone = " \ --disable-multiarch \ --with-arch=armv8-a \ " -EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \ +EXTRA_OECONF:append:armv7r:class-target:xilinx-standalone = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append:xilinx-standalone:armv8r:class-target = " \ +EXTRA_OECONF:append:armv8r:class-target:xilinx-standalone = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ +EXTRA_OECONF:append:microblaze:class-target:xilinx-standalone = " \ --without-long-double-128 \ --disable-tm-clone-registry \ " @@ -34,13 +34,13 @@ EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ # Changes local to gcc-runtime... # Dont build libitm, etc. -RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3" +RUNTIMETARGET:class-target:xilinx-standalone = "libstdc++-v3" -do_install:append:xilinx-standalone:class-target() { +do_install:append:class-target:xilinx-standalone() { # Fixup what gcc-runtime normally would do, we don't want linux directories! rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux } -FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\ +FILES:${PN}-dbg:append:class-target:xilinx-standalone = "\ ${libdir}/libstdc++.a-gdb.py \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend index 0d824324..3fc7a89f 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend @@ -1 +1 @@ -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc index 3417f375..956bb419 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc @@ -7,22 +7,22 @@ EXTRA_OECONF:append:xilinx-standalone = " \ --disable-libitm \ " -EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ +EXTRA_OECONF:append:aarch64:xilinx-standalone = " \ --disable-multiarch \ --with-arch=armv8-a \ " -EXTRA_OECONF:append:xilinx-standalone:armv7r = " \ +EXTRA_OECONF:append:armv7r:xilinx-standalone = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append:xilinx-standalone:armv8r = " \ +EXTRA_OECONF:append:armv8r:xilinx-standalone = " \ --disable-tls \ --disable-decimal-float \ " -EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ +EXTRA_OECONF:append:microblaze:xilinx-standalone = " \ --without-long-double-128 \ --disable-tm-clone-registry \ " diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend index 2d33f5a9..be68197e 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend @@ -1,6 +1,6 @@ require gcc-configure-xilinx-standalone.inc -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ --disable-tm-clone-registry \ diff --git a/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend b/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend index 0d824324..3fc7a89f 100644 --- a/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend @@ -1 +1 @@ -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" diff --git a/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend b/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend index 0d824324..3fc7a89f 100644 --- a/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend +++ b/meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend @@ -1 +1 @@ -COMPATIBLE_HOST = "${HOST_SYS}" +COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5387): https://lists.yoctoproject.org/g/meta-xilinx/message/5387 Mute This Topic: https://lists.yoctoproject.org/mt/106609971/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
