summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@amd.com>2024-05-23 11:36:30 -0600
committerMark Hatle <mark.hatle@amd.com>2024-06-12 15:25:55 -0600
commit5b5d95b3fac2d13d609e00e2cec0c02625e03aa1 (patch)
treecc66aa5ad042333fd4e0602700c453e33b3b2334
parentdb298f1c2974ff15ad3a0b85f2bc368b17996a9e (diff)
downloadmeta-xilinx-5b5d95b3fac2d13d609e00e2cec0c02625e03aa1.tar.gz
meta-xilinx-standalone: adjust bbappends for YP best practices
Ensure that each bbappend only applies when XILINX_WITH_ESW or a related DISTRO is enabled. Signed-off-by: Mark Hatle <mark.hatle@amd.com> (cherry picked from commit af205a7d736001441dc48c523c04d4de370562b7) Signed-off-by: Mark Hatle <mark.hatle@amd.com>
-rw-r--r--meta-xilinx-standalone/recipes-bsp/device-tree/device-tree-meta-xilinx-standalone.inc7
-rw-r--r--meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend10
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-meta-xilinx-standalone.inc18
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl.bbappend19
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw-meta-xilinx-standalone.inc26
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/plmfw.bbappend27
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw-meta-xilinx-standalone.inc26
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/pmufw.bbappend27
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw-meta-xilinx-standalone.inc27
-rw-r--r--meta-xilinx-standalone/recipes-bsp/embeddedsw/psmfw.bbappend28
-rw-r--r--meta-xilinx-standalone/recipes-core/meta/meta-toolchain.bbappend2
-rw-r--r--meta-xilinx-standalone/recipes-core/newlib/libgloss_%.bbappend4
-rw-r--r--meta-xilinx-standalone/recipes-core/newlib/newlib_%.bbappend4
-rw-r--r--meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc4
-rw-r--r--meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc4
-rw-r--r--meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend18
-rw-r--r--meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend2
-rw-r--r--meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc8
-rw-r--r--meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend2
-rw-r--r--meta-xilinx-standalone/recipes-devtools/qemu/qemuwrapper-cross_1.0.bbappend2
-rw-r--r--meta-xilinx-standalone/recipes-kernel/linux/linux-dummy.bbappend2
21 files changed, 136 insertions, 131 deletions
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 @@
1COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*"
2COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*"
3COMPATIBLE_MACHINE:microblaze-pmu = ".*"
4COMPATIBLE_MACHINE:microblaze-plm = ".*"
5COMPATIBLE_MACHINE:cortexa72-versal = ".*"
6COMPATIBLE_MACHINE:cortexr5-versal = ".*"
7COMPATIBLE_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 fcc041fd..b5bbd250 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 @@
1include ${@'device-tree-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''}
2
1COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}" 3COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}"
2COMPATIBLE_HOST:xilinx-freertos = "${HOST_SYS}" 4COMPATIBLE_HOST:xilinx-freertos = "${HOST_SYS}"
3 5
4COMPATIBLE_MACHINE:cortexa53-zynqmp = ".*"
5COMPATIBLE_MACHINE:cortexr5-zynqmp = ".*"
6COMPATIBLE_MACHINE:microblaze-pmu = ".*"
7COMPATIBLE_MACHINE:microblaze-plm = ".*"
8COMPATIBLE_MACHINE:cortexa72-versal = ".*"
9COMPATIBLE_MACHINE:cortexr5-versal = ".*"
10COMPATIBLE_MACHINE:cortexa9-zynq = ".*"
11
12# Enable @ flag on dtc which is required by libxil 6# Enable @ flag on dtc which is required by libxil
13DTC_FLAGS:append:xilinx-standalone = " -@" 7DTC_FLAGS:append:xilinx-standalone = " -@"
14DT_INCLUDE:append:xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/" 8DT_INCLUDE:append:xilinx-standalone = " ${WORKDIR}/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 @@
1# Include the fsbl-fw setting, if it's enabled
2FSBL_INC = "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'fsbl-fw-cfg.inc', '', d)}"
3require ${FSBL_INC}
4
5def check_fsbl_variables(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"):
12 if not d.getVar('WITHIN_EXT_SDK'):
13 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'))
14 else:
15 # We found the file, so be sure to track it
16 d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf')
17 d.setVarFlag('do_install', 'file-checksums', '${FSBL_FILE}.elf:True')
18 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 @@
1# Include the fsbl-fw setting, if it's enabled include ${@'fsbl-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''}
2FSBL_INC = "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'fsbl-fw-cfg.inc', '', d)}"
3require ${FSBL_INC}
4
5def check_fsbl_variables(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('FSBL_DEPENDS') and not d.getVar('FSBL_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 if not os.path.exists(d.getVar('FSBL_FILE') + ".elf"):
12 if not d.getVar('WITHIN_EXT_SDK'):
13 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'))
14 else:
15 # We found the file, so be sure to track it
16 d.setVar('SRC_URI', 'file://${FSBL_FILE}.elf')
17 d.setVarFlag('do_install', 'file-checksums', '${FSBL_FILE}.elf:True')
18 d.setVarFlag('do_deploy', 'file-checksums', '${FSBL_FILE}.elf:True')
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 @@
1# Include the versal-fw setting, if it's enabled
2PLMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
3require ${PLMFW_INC}
4
5def check_plm_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PLM_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PLM_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PLM_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PLM_FILE')
18 fail = True
19 if fail:
20 if not d.getVar('WITHIN_EXT_SDK'):
21 raise bb.parse.SkipRecipe("%s\nEither specify PLM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
22 else:
23 # We found the file, so be sure to track it
24 d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin')
25 d.setVarFlag('do_install', 'file-checksums', '${PLM_FILE}.elf:True')
26 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 @@
1# Include the versal-fw setting, if it's enabled include ${@'plmfw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''}
2PLMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
3require ${PLMFW_INC}
4
5def check_plm_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PLM_DEPENDS') and not d.getVar('PLM_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PLM_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PLM_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PLM_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PLM_FILE')
18 fail = True
19 if fail:
20 if not d.getVar('WITHIN_EXT_SDK'):
21 raise bb.parse.SkipRecipe("%s\nEither specify PLM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
22 else:
23 # We found the file, so be sure to track it
24 d.setVar('SRC_URI', 'file://${PLM_FILE}.elf file://${PLM_FILE}.bin')
25 d.setVarFlag('do_install', 'file-checksums', '${PLM_FILE}.elf:True')
26 d.setVarFlag('do_deploy', 'file-checksums', '${PLM_FILE}.elf:True ${PLM_FILE}.bin:True')
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 @@
1# Include the zynqmp-pmufw setting, if it's enabled
2PMUFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'zynqmp-pmufw-cfg.inc', '', d)}"
3require ${PMUFW_INC}
4
5def check_pmu_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PMU_DEPENDS') and not d.getVar('PMU_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PMU_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PMU_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PMU_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PMU_FILE')
18 fail = True
19 if fail:
20 if not d.getVar('WITHIN_EXT_SDK'):
21 raise bb.parse.SkipRecipe("%s\nEither specify PMU_FILE, or you may need to enable BBMULTICONFIG += 'zynqmp-pmufw' to generate it." % msg)
22 else:
23 # We found the file, so be sure to track it
24 d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin')
25 d.setVarFlag('do_install', 'file-checksums', '${PMU_FILE}.elf:True')
26 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 @@
1# Include the zynqmp-pmufw setting, if it's enabled include ${@'pmufw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''}
2PMUFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'zynqmp-pmufw', 'zynqmp-pmufw-cfg.inc', '', d)}"
3require ${PMUFW_INC}
4
5def check_pmu_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PMU_DEPENDS') and not d.getVar('PMU_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PMU_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PMU_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PMU_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PMU_FILE')
18 fail = True
19 if fail:
20 if not d.getVar('WITHIN_EXT_SDK'):
21 raise bb.parse.SkipRecipe("%s\nEither specify PMU_FILE, or you may need to enable BBMULTICONFIG += 'zynqmp-pmufw' to generate it." % msg)
22 else:
23 # We found the file, so be sure to track it
24 d.setVar('SRC_URI', 'file://${PMU_FILE}.elf file://${PMU_FILE}.bin')
25 d.setVarFlag('do_install', 'file-checksums', '${PMU_FILE}.elf:True')
26 d.setVarFlag('do_deploy', 'file-checksums', '${PMU_FILE}.elf:True ${PMU_FILE}.bin:True')
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 @@
1# Include the versal-fw setting, if it's enabled
2PSMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
3require ${PSMFW_INC}
4
5def check_psm_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PSM_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PSM_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PSM_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PSM_FILE')
18 fail = True
19
20 if fail:
21 if not d.getVar('WITHIN_EXT_SDK'):
22 raise bb.parse.SkipRecipe("%s\nEither specify PSM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
23 else:
24 # We found the file, so be sure to track it
25 d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin')
26 d.setVarFlag('do_install', 'file-checksums', '${PSM_FILE}.elf:True')
27 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 @@
1# Include the versal-fw setting, if it's enabled include ${@'psmfw-meta-xilinx-standalone.inc' if d.getVar('XILINX_WITH_ESW') else ''}
2PSMFW_INC = "${@bb.utils.contains('BBMULTICONFIG', 'versal-fw', 'versal-fw-cfg.inc', '', d)}"
3require ${PSMFW_INC}
4
5def check_psm_vars(d):
6 # If both are blank, the user MUST pass in the path to the firmware!
7 if not d.getVar('PSM_DEPENDS') and not d.getVar('PSM_MCDEPENDS'):
8 # Don't cache this, as the items on disk can change!
9 d.setVar('BB_DONT_CACHE', '1')
10
11 msg = ""
12 fail = False
13 if not os.path.exists(d.getVar('PSM_FILE') + ".elf"):
14 msg = msg + "The expected file %s.elf is not available. " % d.getVar('PSM_FILE')
15 fail = True
16 if not os.path.exists(d.getVar('PSM_FILE') + ".bin"):
17 msg = msg + "The expected file %s.bin is not available. " % d.getVar('PSM_FILE')
18 fail = True
19
20 if fail:
21 if not d.getVar('WITHIN_EXT_SDK'):
22 raise bb.parse.SkipRecipe("%s\nEither specify PSM_FILE, or you may need to enable BBMULTICONFIG += 'versal-fw' to generate it." % msg)
23 else:
24 # We found the file, so be sure to track it
25 d.setVar('SRC_URI', 'file://${PSM_FILE}.elf file://${PSM_FILE}.bin')
26 d.setVarFlag('do_install', 'file-checksums', '${PSM_FILE}.elf:True')
27 d.setVarFlag('do_deploy', 'file-checksums', '${PSM_FILE}.elf:True ${PSM_FILE}.bin:True')
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 @@
1COMPATIBLE_HOST = ".*-elf" 1COMPATIBLE_HOST:xilinx-standalone = ".*-elf"
2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" 2COMPATIBLE_HOST:arm:xilinx-standalone = "[^-]*-[^-]*-eabi"
3 3
4EXTRA_OECONF:append:xilinx-standalone = " \ 4EXTRA_OECONF:append:xilinx-standalone = " \
5 --enable-newlib-io-c99-formats \ 5 --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 @@
1COMPATIBLE_HOST = ".*-elf" 1COMPATIBLE_HOST:xilinx-standalone = ".*-elf"
2COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi" 2COMPATIBLE_HOST:arm:xilinx-standalone = "[^-]*-[^-]*-eabi"
3 3
4EXTRA_OECONF:append:xilinx-standalone = " \ 4EXTRA_OECONF:append:xilinx-standalone = " \
5 --enable-newlib-io-c99-formats \ 5 --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 = " \
9" 9"
10 10
11# CortexR5 and 32-bit arm are both "arm" 11# CortexR5 and 32-bit arm are both "arm"
12EXTRA_OECONF:append:xilinx-standalone:arm = " \ 12EXTRA_OECONF:append:arm:xilinx-standalone = " \
13 --enable-interwork \ 13 --enable-interwork \
14" 14"
15 15
16EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ 16EXTRA_OECONF:append:microblaze:xilinx-standalone = " \
17 --disable-initfini-array \ 17 --disable-initfini-array \
18" 18"
19 19
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 @@
2LINKER_HASH_STYLE:xilinx-standalone = "" 2LINKER_HASH_STYLE:xilinx-standalone = ""
3SYMVERS_CONF:xilinx-standalone = "" 3SYMVERS_CONF:xilinx-standalone = ""
4 4
5EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-initfini_array" 5EXTRA_OECONF:append:microblaze:xilinx-standalone = " --disable-initfini_array"
6 6
7EXTRA_OECONF:append:xilinx-standalone:microblaze = " --disable-__cxa_atexit" 7EXTRA_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 @@
1require gcc-configure-xilinx-standalone.inc 1require gcc-configure-xilinx-standalone.inc
2 2
3COMPATIBLE_HOST = "${HOST_SYS}" 3COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}"
4 4
5EXTRA_OECONF:append:xilinx-standalone:class-target = " \ 5EXTRA_OECONF:append:class-target:xilinx-standalone = " \
6 --disable-libstdcxx-pch \ 6 --disable-libstdcxx-pch \
7 --with-newlib \ 7 --with-newlib \
8 --disable-threads \ 8 --disable-threads \
@@ -11,22 +11,22 @@ EXTRA_OECONF:append:xilinx-standalone:class-target = " \
11 --disable-libitm \ 11 --disable-libitm \
12" 12"
13 13
14EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ 14EXTRA_OECONF:append:aarch64:class-target:xilinx-standalone = " \
15 --disable-multiarch \ 15 --disable-multiarch \
16 --with-arch=armv8-a \ 16 --with-arch=armv8-a \
17 " 17 "
18 18
19EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \ 19EXTRA_OECONF:append:armv7r:class-target:xilinx-standalone = " \
20 --disable-tls \ 20 --disable-tls \
21 --disable-decimal-float \ 21 --disable-decimal-float \
22 " 22 "
23 23
24EXTRA_OECONF:append:xilinx-standalone:armv8r:class-target = " \ 24EXTRA_OECONF:append:armv8r:class-target:xilinx-standalone = " \
25 --disable-tls \ 25 --disable-tls \
26 --disable-decimal-float \ 26 --disable-decimal-float \
27 " 27 "
28 28
29EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ 29EXTRA_OECONF:append:microblaze:class-target:xilinx-standalone = " \
30 --without-long-double-128 \ 30 --without-long-double-128 \
31 --disable-tm-clone-registry \ 31 --disable-tm-clone-registry \
32 " 32 "
@@ -34,13 +34,13 @@ EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \
34# Changes local to gcc-runtime... 34# Changes local to gcc-runtime...
35 35
36# Dont build libitm, etc. 36# Dont build libitm, etc.
37RUNTIMETARGET:xilinx-standalone:class-target = "libstdc++-v3" 37RUNTIMETARGET:class-target:xilinx-standalone = "libstdc++-v3"
38 38
39do_install:append:xilinx-standalone:class-target() { 39do_install:append:class-target:xilinx-standalone() {
40 # Fixup what gcc-runtime normally would do, we don't want linux directories! 40 # Fixup what gcc-runtime normally would do, we don't want linux directories!
41 rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux 41 rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
42} 42}
43 43
44FILES:${PN}-dbg:append:xilinx-standalone:class-target = "\ 44FILES:${PN}-dbg:append:class-target:xilinx-standalone = "\
45 ${libdir}/libstdc++.a-gdb.py \ 45 ${libdir}/libstdc++.a-gdb.py \
46" 46"
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 = " \
7 --disable-libitm \ 7 --disable-libitm \
8" 8"
9 9
10EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ 10EXTRA_OECONF:append:aarch64:xilinx-standalone = " \
11 --disable-multiarch \ 11 --disable-multiarch \
12 --with-arch=armv8-a \ 12 --with-arch=armv8-a \
13 " 13 "
14 14
15EXTRA_OECONF:append:xilinx-standalone:armv7r = " \ 15EXTRA_OECONF:append:armv7r:xilinx-standalone = " \
16 --disable-tls \ 16 --disable-tls \
17 --disable-decimal-float \ 17 --disable-decimal-float \
18 " 18 "
19 19
20EXTRA_OECONF:append:xilinx-standalone:armv8r = " \ 20EXTRA_OECONF:append:armv8r:xilinx-standalone = " \
21 --disable-tls \ 21 --disable-tls \
22 --disable-decimal-float \ 22 --disable-decimal-float \
23 " 23 "
24 24
25EXTRA_OECONF:append:xilinx-standalone:microblaze = " \ 25EXTRA_OECONF:append:microblaze:xilinx-standalone = " \
26 --without-long-double-128 \ 26 --without-long-double-128 \
27 --disable-tm-clone-registry \ 27 --disable-tm-clone-registry \
28 " 28 "
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 @@
1require gcc-configure-xilinx-standalone.inc 1require gcc-configure-xilinx-standalone.inc
2 2
3COMPATIBLE_HOST = "${HOST_SYS}" 3COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}"
4 4
5EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \ 5EXTRA_OECONF:append:xilinx-standalone:microblaze:class-target = " \
6 --disable-tm-clone-registry \ 6 --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}"