87 files changed, 1097 insertions, 1173 deletions
diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass
deleted file mode 100644
index 1f7e35f4..00000000
--- a/meta-xilinx-standalone/classes/esw.bbclass
+++ /dev/null
@@ -1,106 +0,0 @@
-inherit pkgconfig cmake
-LICENSE = "Proprietary"
-LICFILENAME = "license.txt"
-LIC_FILES_CHKSUM = "file://${S}/${LICFILENAME};md5=39ab6ab638f4d1836ba994ec6852de94"
-# We should move to an actual SRCREV eventually
-include conf/xilinx/esw-srcrev.inc
-SRCREV ?= "${AUTOREV}"
-PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
-REPO ?= "git://github.com/xilinx/embeddedsw.git;protocol=https"
-BRANCH ?= "master"
-SRC_URI = "${REPO};branch=${BRANCH}"
-SRCREV_FORMAT = "src_decouple"
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
-SPECFILE_PATH_arm = "${S}/scripts/specs/arm/Xilinx.spec"
-SPECFILE_PATH_aarch64 = "${S}/scripts/specs/arm/Xilinx.spec"
-SPECFILE_PATH_microblaze = "${S}/scripts/specs/microblaze/Xilinx.spec"
-ESW_CFLAGS += "-specs=${SPECFILE_PATH}"
-inherit ccmake
-COMPATIBLE_HOST = ".*-elf"
-COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi"
-DTBFILE ?= "${RECIPE_SYSROOT}/boot/devicetree/system-top.dtb"
-def get_xlnx_cmake_machine(fam, d):
-    cmake_machine = fam
-    if (fam == 'zynqmp'):
-        cmake_machine = 'ZynqMP'
-    elif (fam == 'versal'):
-        cmake_machine = 'Versal'
-    elif (fam == 'zynq'):
-        cmake_machine = 'Zynq'
-    return cmake_machine
-def get_xlnx_cmake_processor(tune, machine, d):
-    cmake_processor = tune
-    if tune.startswith('microblaze'):
-        if (machine == 'microblaze-pmu'):
-            cmake_processor = 'pmu_microblaze'
-        elif (machine == 'microblaze-plm'):
-            cmake_processor = 'plm_microblaze'
-        else:
-            cmake_processor = 'microblaze'
-    elif (tune in [ 'cortexr5', 'cortexr5f' ]):
-        cmake_processor = 'cortexr5'
-    elif tune.startswith('cortexa9'):
-        cmake_processor = 'cortexa9'
-    elif (tune in [ 'cortexa53', 'cortexa72-cortexa53' ]):
-        cmake_processor = 'cortexa53'
-    elif tune == 'cortexa72':
-        cmake_processor = 'cortexa72'
-    return cmake_processor
-XLNX_CMAKE_MACHINE = "${@get_xlnx_cmake_machine(d.getVar('SOC_FAMILY'), d)}"
-XLNX_CMAKE_PROCESSOR = "${@get_xlnx_cmake_processor(d.getVar('DEFAULTTUNE'), d.getVar('MACHINE'), d)}"
-XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
-cmake_do_generate_toolchain_file_append() {
-    cat >> ${WORKDIR}/toolchain.cmake <<EOF
-    include(CMakeForceCompiler)
-    CMAKE_FORCE_C_COMPILER("${OECMAKE_C_COMPILER}" GNU)
-    CMAKE_FORCE_CXX_COMPILER("${OECMAKE_CXX_COMPILER}" GNU)
-    set( CMAKE_SYSTEM_PROCESSOR "${XLNX_CMAKE_PROCESSOR}" )
-    set( CMAKE_MACHINE "${XLNX_CMAKE_MACHINE}" )
-    # 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}" )
-EOF
-}
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    install -m 0755  ${B}/${ESW_COMPONENT_NAME} ${D}${libdir}
-    install -m 0644  ${B}/include/*.h ${D}${includedir}
-}
-CFLAGS_append = " ${ESW_CFLAGS}"
-# 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
-# we dont know for certain we are running devtool or just externalsrc
-python(){
-    import os.path
-    if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'):
-        externalsrc = d.getVar('EXTERNALSRC')
-        lic_file = d.getVar('LIC_FILES_CHKSUM', False)
-        licpath=externalsrc
-        for i in range(5):
-            if os.path.isfile(licpath + '/' + d.getVar('LICFILENAME',True)):
-                lic_file = lic_file.replace('${S}',licpath)
-                d.setVar('LIC_FILES_CHKSUM', lic_file)
-                return
-            licpath=os.path.dirname(licpath)
-        bb.error("Couldn't find license file: %s, within directory %s or his parent directories" % (d.getVar('LICFILENAME',True), externalsrc))
-}
diff --git a/meta-xilinx-standalone/classes/esw_examples.bbclass b/meta-xilinx-standalone/classes/esw_examples.bbclass
deleted file mode 100644
index 391f388e..00000000
--- a/meta-xilinx-standalone/classes/esw_examples.bbclass
+++ /dev/null
@@ -1,27 +0,0 @@
-inherit esw deploy python3native
-DEPENDS += "dtc-native python3-dtc-native python3-pyyaml-native xilstandalone libxil xiltimer device-tree"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_eglist () {
-    cd ${S}
-    nativepython3 ${S}/scripts/example.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask generate_eglist before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
-}
-do_deploy() {
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-freertos.conf b/meta-xilinx-standalone/conf/distro/xilinx-freertos.conf
deleted file mode 100644
index cba5fd90..00000000
--- a/meta-xilinx-standalone/conf/distro/xilinx-freertos.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-require conf/distro/xilinx-standalone.inc
-DISTRO_NAME_append = " (freertos)"
-XLNX_CMAKE_SYSTEM_NAME = "FreeRTOS"
-# We need to pass FREERTOS_BSP compliler flag it is consumed
-# esw components.
-ESW_CFLAGS += " -DFREERTOS_BSP"
diff --git a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf
new file mode 100644
index 00000000..72fbc80f
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf
@@ -0,0 +1,220 @@
+require conf/multilib.conf
+require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/baremetal-tc.conf
+# Define all of the multilibs supproted by this configuration
+MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
+MULTILIBS  = "multilib:libarmv5tesoftfp multilib:libarmv5tehard"
+MULTILIBS += "multilib:libnofp"
+MULTILIBS += "multilib:libv7nofp multilib:libv7fpsoftfp multilib:libv7fphard"
+MULTILIBS += "multilib:libv7anofp"
+MULTILIBS += "multilib:libv7afpsoftfp"
+MULTILIBS += "multilib:libv7afpthf multilib:libv7asimdsoftfp"
+MULTILIBS += "multilib:libv7asimdhard multilib:libv7vesimdsoftfp"
+MULTILIBS += "multilib:libvtvesimdhf"
+MULTILIBS += "multilib:libv8anofp"
+MULTILIBS += "multilib:libv8asimdsoftfp multilib:libv8asimdhard"
+TUNE_CCARGS = "${TUNE_CCARGS_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
+# Base configuration
+# CFLAGS:
+DEFAULTTUNE = "aarch32"
+AVAILTUNES += "aarch32"
+PACKAGE_EXTRA_ARCHS_tune-aarch32 = "${TUNE_PKGARCH_tune-aarch32}"
+BASE_LIB_tune-aarch32 = "lib"
+TUNE_FEATURES_tune-aarch32 = "arm"
+TUNE_CCARGS_tune-aarch32 = ""
+TUNE_PKGARCH_tune-aarch32 = "aarch32"
+# arm/v5te/softfp
+# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
+AVAILTUNES += "armv5tesoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}"
+BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp"
+TUNE_FEATURES_tune-armv5tesoftfp = "arm"
+TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp"
+# arm/v5te/hard
+# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libarmv5tehard = "armv5tehard"
+AVAILTUNES += "armv5tehard"
+PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}"
+BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard"
+TUNE_FEATURES_tune-armv5tehard = "arm"
+TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf"
+# thumb/nofp
+# CFLAGS: -mthumb -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libnofp = "armnofp"
+AVAILTUNES += "armnofp"
+PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}"
+BASE_LIB_tune-armnofp = "lib/thumb/nofp"
+TUNE_FEATURES_tune-armnofp = "arm"
+TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armnofp = "armt"
+# thumb/v7/nofp
+# CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv7nofp = "armv7nofp"
+AVAILTUNES += "armv7nofp"
+PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}"
+BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp"
+TUNE_FEATURES_tune-armv7nofp = "arm"
+TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv7nofp = "armv7t"
+# thumb/v7+fp/softfp
+# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
+AVAILTUNES += "armv7fpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}"
+BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
+TUNE_FEATURES_tune-armv7fpsoftfp = "arm"
+TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt"
+# thumb/v7+fp/hard
+# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7fphard = "armv7fphard"
+AVAILTUNES += "armv7fphard"
+PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}"
+BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard"
+TUNE_FEATURES_tune-armv7fphard = "arm"
+TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf"
+# thumb/v7-a/nofp
+# CFLAGS: -mthumb -march=armv7-a -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv7anofp = "armv7anofp"
+AVAILTUNES += "armv7anofp"
+PACKAGE_EXTRA_ARCHS_tune-armv7anofp = "${TUNE_PKGARCH_tune-armv7anofp}"
+BASE_LIB_tune-armv7anofp = "lib/thumb/v7-a/nofp"
+TUNE_FEATURES_tune-armv7anofp = "arm"
+TUNE_CCARGS_tune-armv7anofp = "-mthumb -march=armv7-a -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv7anofp = "armv7at"
+# thumb/v7-a+fp/softfp
+# CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7afpsoftfp = "armv7afpsoftfp"
+AVAILTUNES += "armv7afpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7afpsoftfp = "${TUNE_PKGARCH_tune-armv7afpsoftfp}"
+BASE_LIB_tune-armv7afpsoftfp = "lib/thumb/v7-a+fp/softfp"
+TUNE_FEATURES_tune-armv7afpsoftfp = "arm"
+TUNE_CCARGS_tune-armv7afpsoftfp = "-mthumb -march=armv7-a+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7afpsoftfp = "armv7afpt"
+# thumb/v7-a+fp/hard
+# CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7afpthf = "armv7afpthf"
+AVAILTUNES += "armv7afpthf"
+PACKAGE_EXTRA_ARCHS_tune-armv7afpthf = "${TUNE_PKGARCH_tune-armv7afpthf}"
+BASE_LIB_tune-armv7afpthf = "lib/thumb/v7-a+fp/hard"
+TUNE_FEATURES_tune-armv7afpthf = "arm"
+TUNE_CCARGS_tune-armv7afpthf = "-mthumb -march=armv7-a+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7afpthf = "armv7afpthf"
+# thumb/v7-a+simd/softfp
+# CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7asimdsoftfp = "armv7asimdsoftfp"
+AVAILTUNES += "armv7asimdsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7asimdsoftfp = "${TUNE_PKGARCH_tune-armv7asimdsoftfp}"
+BASE_LIB_tune-armv7asimdsoftfp = "lib/thumb/v7-a+simd/softfp"
+TUNE_FEATURES_tune-armv7asimdsoftfp = "arm"
+TUNE_CCARGS_tune-armv7asimdsoftfp = "-mthumb -march=armv7-a+simd -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7asimdsoftfp = "armv7asimdt"
+# thumb/v7-a+simd/hard
+# CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7asimdhard = "armv7asimdhard"
+AVAILTUNES += "armv7asimdhard"
+PACKAGE_EXTRA_ARCHS_tune-armv7asimdhard = "${TUNE_PKGARCH_tune-armv7asimdhard}"
+BASE_LIB_tune-armv7asimdhard = "lib/thumb/v7-a+simd/hard"
+TUNE_FEATURES_tune-armv7asimdhard = "arm"
+TUNE_CCARGS_tune-armv7asimdhard = "-mthumb -march=armv7-a+simd -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7asimdhard = "armv7asimdthf"
+# thumb/v7ve+simd/softfp
+# CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7vesimdsoftfp = "armv7vesimdsoftfp"
+AVAILTUNES += "armv7vesimdsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7vesimdsoftfp = "${TUNE_PKGARCH_tune-armv7vesimdsoftfp}"
+BASE_LIB_tune-armv7vesimdsoftfp = "lib/thumb/v7ve+simd/softfp"
+TUNE_FEATURES_tune-armv7vesimdsoftfp = "arm"
+TUNE_CCARGS_tune-armv7vesimdsoftfp = "-mthumb -march=armv7ve+simd -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7vesimdsoftfp = "armv7vesimdt"
+# thumb/v7ve+simd/hard
+# CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libvtvesimdhf = "armvtvesimdhf"
+AVAILTUNES += "armvtvesimdhf"
+PACKAGE_EXTRA_ARCHS_tune-armvtvesimdhf = "${TUNE_PKGARCH_tune-armvtvesimdhf}"
+BASE_LIB_tune-armvtvesimdhf = "lib/thumb/v7ve+simd/hard"
+TUNE_FEATURES_tune-armvtvesimdhf = "arm"
+TUNE_CCARGS_tune-armvtvesimdhf = "-mthumb -march=armv7ve+simd -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armvtvesimdhf = "armv7vesimdthf"
+# thumb/v8-a/nofp
+# CFLAGS: -mthumb -march=armv8-a -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv8anofp = "armv8anofp"
+AVAILTUNES += "armv8anofp"
+PACKAGE_EXTRA_ARCHS_tune-armv8anofp = "${TUNE_PKGARCH_tune-armv8anofp}"
+BASE_LIB_tune-armv8anofp = "lib/thumb/v8-a/nofp"
+TUNE_FEATURES_tune-armv8anofp = "arm"
+TUNE_CCARGS_tune-armv8anofp = "-mthumb -march=armv8-a -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv8anofp = "armv8at"
+# thumb/v8-a+simd/softfp
+# CFLAGS: -mthumb -march=armv8-a+simd -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv8asimdsoftfp = "armv8asimdsoftfp"
+AVAILTUNES += "armv8asimdsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv8asimdsoftfp = "${TUNE_PKGARCH_tune-armv8asimdsoftfp}"
+BASE_LIB_tune-armv8asimdsoftfp = "lib/thumb/v8-a+simd/softfp"
+TUNE_FEATURES_tune-armv8asimdsoftfp = "arm"
+TUNE_CCARGS_tune-armv8asimdsoftfp = "-mthumb -march=armv8-a+simd -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv8asimdsoftfp = "armv8asimdt"
+# thumb/v8-a+simd/hard
+# CFLAGS:  -mthumb -march=armv8-a+simd -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv8asimdhard = "armv8asimdhard"
+AVAILTUNES += "armv8asimdhard"
+PACKAGE_EXTRA_ARCHS_tune-armv8asimdhard = "${TUNE_PKGARCH_tune-armv8asimdhard}"
+BASE_LIB_tune-armv8asimdhard = "lib/thumb/v8-a+simd/hard"
+TUNE_FEATURES_tune-armv8asimdhard = "arm"
+TUNE_CCARGS_tune-armv8asimdhard = "-mthumb -march=armv8-a+simd -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv8asimdhard = "armv8asimdthf"
diff --git a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf
new file mode 100644
index 00000000..08c2d1c6
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf
@@ -0,0 +1,29 @@
+require conf/multilib.conf
+require conf/machine/include/tune-cortexa72-cortexa53.inc
+require conf/machine/include/baremetal-tc.conf
+# Define ilp32 variant (not in tune files)
+TUNEVALID[ilp32] = "ilp32 ABI"
+TUNE_CCARGS .= '${@bb.utils.contains("TUNE_FEATURES", "ilp32", " -mabi=ilp32", "", d)}'
+# ILP request an alternative machine dictionary
+INHERIT += "xlnx-standalone"
+PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "ilp32", " xlnx_ilp32_dict", "", d)}'
+# Define all of the multilibs supported by this configuration
+MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
+MULTILIBS = "multilib:libilp32"
+# Base configuration
+# CFLAGS:
+DEFAULTTUNE = "cortexa72-cortexa53"
+# CFLAGS: -mabi=ilp32
+DEFAULTTUNE_virtclass-multilib-libilp32 = "cortexa72-cortexa53-ilp32"
+AVAILTUNES += "cortexa72-cortexa53-ilp32"
+ARMPKGARCH_tune-cortexa72-cortexa53-ilp32 = "${ARMPKGARCH_tune-cortexa72-cortexa53}-ilp32"
+TUNE_FEATURES_tune-cortexa72-cortexa53-ilp32 = "${TUNE_FEATURES_tune-cortexa72-cortexa53} ilp32"
+PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-ilp32 = "${PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53} cortexa72-cortexa53-ilp32"
+BASE_LIB_tune-cortexa72-cortexa53-ilp32 = "lib/ilp32"
diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf
new file mode 100644
index 00000000..c1313339
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf
@@ -0,0 +1,264 @@
+require conf/multilib.conf
+require conf/machine/include/tune-cortexrm.inc
+require conf/machine/include/baremetal-tc.conf
+# Define all of the multilibs supproted by this configuration
+MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
+MULTILIBS  = "multilib:libarmv5tesoftfp multilib:libarmv5tehard"
+MULTILIBS += "multilib:libnofp"
+MULTILIBS += "multilib:libv7nofp multilib:libv7fpsoftfp multilib:libv7fphard"
+MULTILIBS += "multilib:libv6mnofp"
+MULTILIBS += "multilib:libv7mnofp"
+MULTILIBS += "multilib:libv7emnofp multilib:libv7emfpsoftfp"
+MULTILIBS += "multilib:libv7emfphard multilib:libv7emdpsoftfp"
+MULTILIBS += "multilib:libv7emdphard"
+MULTILIBS += "multilib:libv8mbasenofp"
+MULTILIBS += "multilib:libv8mmainnofp multilib:libv8mmainfpsoftfp multilib:libv8mmainfphard multilib:libv8mmaindpsoftfp multilib:libv8mmaindphard"
+TUNE_CCARGS = "${TUNE_CCARGS_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
+# Base configuration
+# CFLAGS:
+DEFAULTTUNE = "armrm"
+AVAILTUNES += "armrm"
+PACKAGE_EXTRA_ARCHS_tune-armrm = "${TUNE_PKGARCH_tune-armrm}"
+BASE_LIB_tune-armrm = "lib"
+TUNE_FEATURES_tune-armrm = "arm armrm"
+TUNE_CCARGS_tune-armrm = ""
+TUNE_PKGARCH_tune-armrm = "armrm"
+# arm/v5te/softfp
+# CFLAGS:  -marm -march=armv5te+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
+AVAILTUNES += "armv5tesoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}"
+BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp"
+TUNE_FEATURES_tune-armv5tesoftfp = "arm armrm"
+TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp"
+# arm/v5te/hard
+# CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libarmv5tehard = "armv5tehard"
+AVAILTUNES += "armv5tehard"
+PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}"
+BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard"
+TUNE_FEATURES_tune-armv5tehard = "arm armrm"
+TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf"
+# thumb/nofp
+# CFLAGS: -mthumb -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libnofp = "armnofp"
+AVAILTUNES += "armnofp"
+PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}"
+BASE_LIB_tune-armnofp = "lib/thumb/nofp"
+TUNE_FEATURES_tune-armnofp = "arm armrm"
+TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armnofp = "armt"
+# thumb/v7/nofp
+# CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv7nofp = "armv7nofp"
+AVAILTUNES += "armv7nofp"
+PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}"
+BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp"
+TUNE_FEATURES_tune-armv7nofp ="arm armrm"
+TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv7nofp = "armv7t"
+# thumb/v7+fp/softfp
+# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
+AVAILTUNES += "armv7fpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}"
+BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
+TUNE_FEATURES_tune-armv7fpsoftfp ="arm armrm"
+TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt"
+# thumb/v7+fp/hard
+# CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7fphard = "armv7fphard"
+AVAILTUNES += "armv7fphard"
+PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}"
+BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard"
+TUNE_FEATURES_tune-armv7fphard ="arm armrm"
+TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf"
+# thumb/v6-m/nofp
+# CFLAGS: -mthumb -march=armv6s-m -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv6mnofp = "armv6mnofp"
+# Workaround for this multilib in newlib
+# newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip
+EXTRA_OECONF_append_pn-libv6mnofp-newlib     = " --disable-newlib-supplied-syscalls"
+AVAILTUNES += "armv6mnofp"
+PACKAGE_EXTRA_ARCHS_tune-armv6mnofp = "${TUNE_PKGARCH_tune-armv6mnofp}"
+BASE_LIB_tune-armv6mnofp = "lib/thumb/v6-m/nofp"
+TUNE_FEATURES_tune-armv6mnofp ="arm armrm"
+TUNE_CCARGS_tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv6mnofp = "armv6smt"
+# thumb/v7-m/nofp
+# CFLAGS: -mthumb -march=armv7-m -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv7mnofp = "armv7mnofp"
+AVAILTUNES += "armv7mnofp"
+PACKAGE_EXTRA_ARCHS_tune-armv7mnofp = "${TUNE_PKGARCH_tune-armv7mnofp}"
+BASE_LIB_tune-armv7mnofp = "lib/thumb/v7-m/nofp"
+TUNE_FEATURES_tune-armv7mnofp ="arm armrm"
+TUNE_CCARGS_tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv7mnofp = "armv7mt"
+# thumb/v7e-m/nofp
+# CFLAGS: -mthumb -march=armv7e-m -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv7emnofp = "armv7emnofp"
+AVAILTUNES += "armv7emnofp"
+PACKAGE_EXTRA_ARCHS_tune-armv7emnofp = "${TUNE_PKGARCH_tune-armv7emnofp}"
+BASE_LIB_tune-armv7emnofp = "lib/thumb/v7e-m/nofp"
+TUNE_FEATURES_tune-armv7emnofp ="arm armrm"
+TUNE_CCARGS_tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv7emnofp = "armv7emt"
+# thumb/v7e-m+fp/softfp
+# CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp"
+AVAILTUNES += "armv7emfpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7emfpsoftfp = "${TUNE_PKGARCH_tune-armv7emfpsoftfp}"
+BASE_LIB_tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp"
+TUNE_FEATURES_tune-armv7emfpsoftfp ="arm armrm"
+TUNE_CCARGS_tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7emfpsoftfp = "armv7emfpt"
+# thumb/v7e-m+fp/hard
+# CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7emfphard = "armv7emfphard"
+AVAILTUNES += "armv7emfphard"
+PACKAGE_EXTRA_ARCHS_tune-armv7emfphard = "${TUNE_PKGARCH_tune-armv7emfphard}"
+BASE_LIB_tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard"
+TUNE_FEATURES_tune-armv7emfphard ="arm armrm"
+TUNE_CCARGS_tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7emfphard = "armv7emfpthf"
+# thumb/v7e-m+dp/softfp
+# CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp"
+AVAILTUNES += "armv7emdpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv7emdpsoftfp = "${TUNE_PKGARCH_tune-armv7emdpsoftfp}"
+BASE_LIB_tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp"
+TUNE_FEATURES_tune-armv7emdpsoftfp ="arm armrm"
+TUNE_CCARGS_tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv7emdpsoftfp = "armv7emdp"
+# thumb/v7e-m+dp/hard
+# CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv7emdphard = "armv7emdphard"
+AVAILTUNES += "armv7emdphard"
+PACKAGE_EXTRA_ARCHS_tune-armv7emdphard = "${TUNE_PKGARCH_tune-armv7emdphard}"
+BASE_LIB_tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard"
+TUNE_FEATURES_tune-armv7emdphard ="arm armrm"
+TUNE_CCARGS_tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv7emdphard = "armv7emdpthf"
+# thumb/v8-m.base/nofp
+# CFLAGS: -mthumb -march=armv8-m.base -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv8mbasenofp = "armv8mbasenofp"
+# Workaround for this multilib in newlib
+# newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip'
+EXTRA_OECONF_append_pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-syscalls"
+AVAILTUNES += "armv8mbasenofp"
+PACKAGE_EXTRA_ARCHS_tune-armv8mbasenofp = "${TUNE_PKGARCH_tune-armv8mbasenofp}"
+BASE_LIB_tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp"
+TUNE_FEATURES_tune-armv8mbasenofp ="arm armrm"
+TUNE_CCARGS_tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv8mbasenofp = "armv8mbaset"
+# thumb/v8-m.main/nofp
+# CFLAGS: -mthumb -march=armv8-m.main -mfloat-abi=soft
+DEFAULTTUNE_virtclass-multilib-libv8mmainnofp = "armv8mmainnofp"
+AVAILTUNES += "armv8mmainnofp"
+PACKAGE_EXTRA_ARCHS_tune-armv8mmainnofp = "${TUNE_PKGARCH_tune-armv8mmainnofp}"
+BASE_LIB_tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp"
+TUNE_FEATURES_tune-armv8mmainnofp ="arm armrm"
+TUNE_CCARGS_tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft"
+TUNE_PKGARCH_tune-armv8mmainnofp = "armv8mmaint"
+# thumb/v8-m.main+fp/softfp
+# CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp"
+AVAILTUNES += "armv8mmainfpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH_tune-armv8mmainfpsoftfp}"
+BASE_LIB_tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp"
+TUNE_FEATURES_tune-armv8mmainfpsoftfp ="arm armrm"
+TUNE_CCARGS_tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv8mmainfpsoftfp = "armv8mmainfpt"
+# thumb/v8-m.main+fp/hard
+# CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv8mmainfphard = "armv8mmainfphard"
+AVAILTUNES += "armv8mmainfphard"
+PACKAGE_EXTRA_ARCHS_tune-armv8mmainfphard = "${TUNE_PKGARCH_tune-armv8mmainfphard}"
+BASE_LIB_tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard"
+TUNE_FEATURES_tune-armv8mmainfphard ="arm armrm"
+TUNE_CCARGS_tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv8mmainfphard = "armv8mmainfpthf"
+# thumb/v8-m.main+dp/softfp
+# CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp
+DEFAULTTUNE_virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp"
+AVAILTUNES += "armv8mmaindpsoftfp"
+PACKAGE_EXTRA_ARCHS_tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH_tune-armv8mmaindpsoftfp}"
+BASE_LIB_tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp"
+TUNE_FEATURES_tune-armv8mmaindpsoftfp ="arm armrm"
+TUNE_CCARGS_tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp"
+TUNE_PKGARCH_tune-armv8mmaindpsoftfp = "armv8mmainfpdpt"
+# thumb/v8-m.main+dp/hard
+# CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard
+DEFAULTTUNE_virtclass-multilib-libv8mmaindphard = "armv8mmaindphard"
+AVAILTUNES += "armv8mmaindphard"
+PACKAGE_EXTRA_ARCHS_tune-armv8mmaindphard = "${TUNE_PKGARCH_tune-armv8mmaindphard}"
+BASE_LIB_tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard"
+TUNE_FEATURES_tune-armv8mmaindphard ="arm armrm"
+TUNE_CCARGS_tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard"
+TUNE_PKGARCH_tune-armv8mmaindphard = "armv8mmainfpdpthf"
diff --git a/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf b/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf
new file mode 100644
index 00000000..d2bbab0d
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/cortexa53-zynqmp.conf
@@ -0,0 +1,3 @@
+DEFAULTTUNE ?= "cortexa53"
+require conf/machine/include/soc-zynqmp.inc
diff --git a/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf b/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf
new file mode 100644
index 00000000..27e109c0
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/cortexa72-versal.conf
@@ -0,0 +1,3 @@
+DEFAULTTUNE ?= "cortexa72"
+require conf/machine/include/soc-versal.inc
diff --git a/meta-xilinx-standalone/conf/machine/cortexa9-zynq.conf b/meta-xilinx-standalone/conf/machine/cortexa9-zynq.conf
new file mode 100644
index 00000000..02568109
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/cortexa9-zynq.conf
@@ -0,0 +1 @@
+require conf/machine/include/soc-zynq.inc
diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf b/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf
new file mode 100644
index 00000000..fa58dc00
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/cortexr5-versal.conf
@@ -0,0 +1,3 @@
+DEFAULTTUNE ?= "cortexr5f"
+require conf/machine/include/soc-versal.inc
diff --git a/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf b/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf
new file mode 100644
index 00000000..817150f8
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/cortexr5-zynqmp.conf
@@ -0,0 +1,3 @@
+DEFAULTTUNE ?= "cortexr5f"
+require conf/machine/include/soc-zynqmp.inc
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-plm.conf b/meta-xilinx-standalone/conf/machine/microblaze-plm.conf
new file mode 100644
index 00000000..9ab8a46b
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/microblaze-plm.conf
@@ -0,0 +1,10 @@
+DEFAULTTUNE ?= "microblaze"
+require conf/machine/include/soc-versal.inc
+# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
+AVAILTUNES += "microblaze"
+TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+LINKER_HASH_STYLE_microblaze = "sysv"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf b/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf
new file mode 100644
index 00000000..09fd3c80
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf
@@ -0,0 +1,10 @@
+DEFAULTTUNE ?= "microblaze"
+require conf/machine/include/soc-zynqmp.inc
+# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
+AVAILTUNES += "microblaze"
+TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+LINKER_HASH_STYLE_microblaze = "sysv"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
new file mode 100644
index 00000000..bc80ad75
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
@@ -0,0 +1,541 @@
+require conf/multilib.conf
+require conf/machine/include/microblaze/arch-microblaze.inc
+require conf/machine/include/baremetal-tc.conf
+# ILP request an alternative machine dictionary
+INHERIT += "xlnx-standalone"
+PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}'
+# GNU hash style not supported
+LINKER_HASH_STYLE_microblaze = ""
+# Define all of the multilibs supproted by this configuration
+MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
+MULTILIBS += "multilib:libmble"
+MULTILIBS += "multilib:libmbbs"
+MULTILIBS += "multilib:libmbp"
+MULTILIBS += "multilib:libmbm"
+MULTILIBS += "multilib:libmbfpd"
+MULTILIBS += "multilib:libmbmfpd"
+MULTILIBS += "multilib:libmbpm"
+MULTILIBS += "multilib:libmbpfpd"
+MULTILIBS += "multilib:libmbpmfpd"
+MULTILIBS += "multilib:libmbbsp"
+MULTILIBS += "multilib:libmbbsm"
+MULTILIBS += "multilib:libmbbsfpd"
+MULTILIBS += "multilib:libmbbsmfpd"
+MULTILIBS += "multilib:libmbbspm"
+MULTILIBS += "multilib:libmbbspfpd"
+MULTILIBS += "multilib:libmbbspmfpd"
+MULTILIBS += "multilib:libmblem64"
+MULTILIBS += "multilib:libmblebs"
+MULTILIBS += "multilib:libmblep"
+MULTILIBS += "multilib:libmblem"
+MULTILIBS += "multilib:libmblefpd"
+MULTILIBS += "multilib:libmblemfpd"
+MULTILIBS += "multilib:libmblepm"
+MULTILIBS += "multilib:libmblepfpd"
+MULTILIBS += "multilib:libmblepmfpd"
+MULTILIBS += "multilib:libmblebsp"
+MULTILIBS += "multilib:libmblebsm"
+MULTILIBS += "multilib:libmblebsfpd"
+MULTILIBS += "multilib:libmblebsmfpd"
+MULTILIBS += "multilib:libmblebspm"
+MULTILIBS += "multilib:libmblebspfpd"
+MULTILIBS += "multilib:libmblebspmfpd"
+MULTILIBS += "multilib:libmblem64bs"
+MULTILIBS += "multilib:libmblem64p"
+MULTILIBS += "multilib:libmblem64m"
+MULTILIBS += "multilib:libmblem64fpd"
+MULTILIBS += "multilib:libmblem64mfpd"
+MULTILIBS += "multilib:libmblem64pm"
+MULTILIBS += "multilib:libmblem64pfpd"
+MULTILIBS += "multilib:libmblem64pmfpd"
+MULTILIBS += "multilib:libmblem64bsp"
+MULTILIBS += "multilib:libmblem64bsm"
+MULTILIBS += "multilib:libmblem64bsfpd"
+MULTILIBS += "multilib:libmblem64bsmfpd"
+MULTILIBS += "multilib:libmblem64bspm"
+MULTILIBS += "multilib:libmblem64bspfpd"
+MULTILIBS += "multilib:libmblem64bspmfpd"
+# Base configuration
+# CFLAGS:
+DEFAULTTUNE = "microblaze"
+AVAILTUNES += "microblaze"
+BASE_LIB_tune-microblaze = "lib"
+TUNE_FEATURES_tune-microblaze = "microblaze bigendian"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+# le
+# CFLAGS: -mlittle-endian
+DEFAULTTUNE_virtclass-multilib-libmble = "microblazele"
+AVAILTUNES += "microblazele"
+BASE_LIB_tune-microblazele = "lib/le"
+TUNE_FEATURES_tune-microblazele = "microblaze"
+PACKAGE_EXTRA_ARCHS_tune-microblazele = "${TUNE_PKGARCH}"
+# bs
+# CFLAGS: -mxl-barrel-shift
+DEFAULTTUNE_virtclass-multilib-libmbbs = "microblazebs"
+AVAILTUNES += "microblazebs"
+BASE_LIB_tune-microblazebs = "lib/bs"
+TUNE_FEATURES_tune-microblazebs = "microblaze bigendian barrel-shift"
+PACKAGE_EXTRA_ARCHS_tune-microblazebs = "${TUNE_PKGARCH}"
+# p
+# CFLAGS: -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmbp = "microblazep"
+AVAILTUNES += "microblazep"
+BASE_LIB_tune-microblazep = "lib/p"
+TUNE_FEATURES_tune-microblazep = "microblaze bigendian pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazep = "${TUNE_PKGARCH}"
+# m
+# CFLAGS: -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem"
+AVAILTUNES += "microblazem"
+BASE_LIB_tune-microblazem = "lib/m"
+TUNE_FEATURES_tune-microblazem = "microblaze bigendian multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazem = "${TUNE_PKGARCH}"
+# fpd
+# CFLAGS: -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbfpd = "microblazefpd"
+AVAILTUNES += "microblazefpd"
+BASE_LIB_tune-microblazefpd = "lib/fpd"
+TUNE_FEATURES_tune-microblazefpd = "microblaze bigendian fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazefpd = "${TUNE_PKGARCH}"
+# m/fpd
+# CFLAGS: -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbmfpd = "microblazemfpd"
+AVAILTUNES += "microblazemfpd"
+BASE_LIB_tune-microblazemfpd = "lib/m/fpd"
+TUNE_FEATURES_tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazemfpd = "${TUNE_PKGARCH}"
+# p/m
+# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmbpm = "microblazepm"
+AVAILTUNES += "microblazepm"
+BASE_LIB_tune-microblazepm = "lib/p/m"
+TUNE_FEATURES_tune-microblazepm = "microblaze bigendian pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazepm = "${TUNE_PKGARCH}"
+# p/fpd
+# CFLAGS: -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbpfpd = "microblazepfpd"
+AVAILTUNES += "microblazepfpd"
+BASE_LIB_tune-microblazepfpd = "lib/p/fpd"
+TUNE_FEATURES_tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazepfpd = "${TUNE_PKGARCH}"
+# p/m/fpd
+# CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbpmfpd = "microblazepmfpd"
+AVAILTUNES += "microblazepmfpd"
+BASE_LIB_tune-microblazepmfpd = "lib/p/m/fpd"
+TUNE_FEATURES_tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazepmfpd = "${TUNE_PKGARCH}"
+# bs/p
+# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmbbsp = "microblazebsp"
+AVAILTUNES += "microblazebsp"
+BASE_LIB_tune-microblazebsp = "lib/bs/p"
+TUNE_FEATURES_tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazebsp = "${TUNE_PKGARCH}"
+# bs/m
+# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmbbsm = "microblazebsm"
+AVAILTUNES += "microblazebsm"
+BASE_LIB_tune-microblazebsm = "lib/bs/m"
+TUNE_FEATURES_tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazebsm = "${TUNE_PKGARCH}"
+# bs/fpd
+# CFLAGS: -mxl-barrel-shift -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbbsfpd = "microblazebsfpd"
+AVAILTUNES += "microblazebsfpd"
+BASE_LIB_tune-microblazebsfpd = "lib/bs/fpd"
+TUNE_FEATURES_tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazebsfpd = "${TUNE_PKGARCH}"
+# bs/m/fpd
+# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbbsmfpd = "microblazebsmfpd"
+AVAILTUNES += "microblazebsmfpd"
+BASE_LIB_tune-microblazebsmfpd = "lib/bs/m/fpd"
+TUNE_FEATURES_tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazebsmfpd = "${TUNE_PKGARCH}"
+# bs/p/m
+# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmbbspm = "microblazebspm"
+AVAILTUNES += "microblazebspm"
+BASE_LIB_tune-microblazebspm = "lib/bs/p/m"
+TUNE_FEATURES_tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazebspm = "${TUNE_PKGARCH}"
+# bs/p/fpd
+# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbbspfpd = "microblazebspfpd"
+AVAILTUNES += "microblazebspfpd"
+BASE_LIB_tune-microblazebspfpd = "lib/bs/p/fpd"
+TUNE_FEATURES_tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazebspfpd = "${TUNE_PKGARCH}"
+# bs/p/m/fpd
+# CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmbbspmfpd = "microblazebspmfpd"
+AVAILTUNES += "microblazebspmfpd"
+BASE_LIB_tune-microblazebspmfpd = "lib/bs/p/m/fpd"
+TUNE_FEATURES_tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazebspmfpd = "${TUNE_PKGARCH}"
+# le/m64
+# CFLAGS: -mlittle-endian -m64
+DEFAULTTUNE_virtclass-multilib-libmblem64 = "microblazele64"
+AVAILTUNES += "microblazele64"
+BASE_LIB_tune-microblazele64 = "lib/le/m64"
+TUNE_FEATURES_tune-microblazele64 = "microblaze 64-bit"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64 = "${TUNE_PKGARCH}"
+# le/bs
+# CFLAGS: -mlittle-endian -mxl-barrel-shift
+DEFAULTTUNE_virtclass-multilib-libmblebs = "microblazelebs"
+AVAILTUNES += "microblazelebs"
+BASE_LIB_tune-microblazelebs = "lib/le/bs"
+TUNE_FEATURES_tune-microblazelebs = "microblaze barrel-shift"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebs = "${TUNE_PKGARCH}"
+# le/p
+# CFLAGS: -mlittle-endian -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmblep = "microblazelep"
+AVAILTUNES += "microblazelep"
+BASE_LIB_tune-microblazelep = "lib/le/p"
+TUNE_FEATURES_tune-microblazelep = "microblaze pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazelep = "${TUNE_PKGARCH}"
+# le/m
+# CFLAGS: -mlittle-endian -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblem = "microblazelem"
+AVAILTUNES += "microblazelem"
+BASE_LIB_tune-microblazelem = "lib/le/m"
+TUNE_FEATURES_tune-microblazelem = "microblaze multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazelem = "${TUNE_PKGARCH}"
+# le/fpd
+# CFLAGS: -mlittle-endian -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblefpd = "microblazelefpd"
+AVAILTUNES += "microblazelefpd"
+BASE_LIB_tune-microblazelefpd = "lib/le/fpd"
+TUNE_FEATURES_tune-microblazelefpd = "microblaze fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelefpd = "${TUNE_PKGARCH}"
+# le/m/fpd
+# CFLAGS: -mlittle-endian -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblemfpd = "microblazelemfpd"
+AVAILTUNES += "microblazelemfpd"
+BASE_LIB_tune-microblazelemfpd = "lib/le/m/fpd"
+TUNE_FEATURES_tune-microblazelemfpd = "microblaze multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelemfpd = "${TUNE_PKGARCH}"
+# le/p/m
+# CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblepm = "microblazelepm"
+AVAILTUNES += "microblazelepm"
+BASE_LIB_tune-microblazelepm = "lib/le/p/m"
+TUNE_FEATURES_tune-microblazelepm = "microblaze pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazelepm = "${TUNE_PKGARCH}"
+# le/p/fpd
+# CFLAGS: -mlittle-endian -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblepfpd = "microblazelepfpd"
+AVAILTUNES += "microblazelepfpd"
+BASE_LIB_tune-microblazelepfpd = "lib/le/p/fpd"
+TUNE_FEATURES_tune-microblazelepfpd = "microblaze pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelepfpd = "${TUNE_PKGARCH}"
+# le/p/m/fpd
+# CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblepmfpd = "microblazelepmfpd"
+AVAILTUNES += "microblazelepmfpd"
+BASE_LIB_tune-microblazelepmfpd = "lib/le/p/m/fpd"
+TUNE_FEATURES_tune-microblazelepmfpd = "microblaze pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelepmfpd = "${TUNE_PKGARCH}"
+# le/bs/p
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmblebsp = "microblazelebsp"
+AVAILTUNES += "microblazelebsp"
+BASE_LIB_tune-microblazelebsp = "lib/le/bs/p"
+TUNE_FEATURES_tune-microblazelebsp = "microblaze barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebsp = "${TUNE_PKGARCH}"
+# le/bs/m
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblebsm = "microblazelebsm"
+AVAILTUNES += "microblazelebsm"
+BASE_LIB_tune-microblazelebsm = "lib/le/bs/m"
+TUNE_FEATURES_tune-microblazelebsm = "microblaze barrel-shift multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebsm = "${TUNE_PKGARCH}"
+# le/bs/fpd
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblebsfpd = "microblazelebsfpd"
+AVAILTUNES += "microblazelebsfpd"
+BASE_LIB_tune-microblazelebsfpd = "lib/le/bs/fpd"
+TUNE_FEATURES_tune-microblazelebsfpd = "microblaze barrel-shift fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebsfpd = "${TUNE_PKGARCH}"
+# le/bs/m/fpd
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblebsmfpd = "microblazelebsmfpd"
+AVAILTUNES += "microblazelebsmfpd"
+BASE_LIB_tune-microblazelebsmfpd = "lib/le/bs/m/fpd"
+TUNE_FEATURES_tune-microblazelebsmfpd = "microblaze barrel-shift multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebsmfpd = "${TUNE_PKGARCH}"
+# le/bs/p/m
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblebspm = "microblazelebspm"
+AVAILTUNES += "microblazelebspm"
+BASE_LIB_tune-microblazelebspm = "lib/le/bs/p/m"
+TUNE_FEATURES_tune-microblazelebspm = "microblaze barrel-shift pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebspm = "${TUNE_PKGARCH}"
+# le/bs/p/fpd
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblebspfpd = "microblazelebspfpd"
+AVAILTUNES += "microblazelebspfpd"
+BASE_LIB_tune-microblazelebspfpd = "lib/le/bs/p/fpd"
+TUNE_FEATURES_tune-microblazelebspfpd = "microblaze barrel-shift pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebspfpd = "${TUNE_PKGARCH}"
+# le/bs/p/m/fpd
+# CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblebspmfpd = "microblazelebspmfpd"
+AVAILTUNES += "microblazelebspmfpd"
+BASE_LIB_tune-microblazelebspmfpd = "lib/le/bs/p/m/fpd"
+TUNE_FEATURES_tune-microblazelebspmfpd = "microblaze barrel-shift pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazelebspmfpd = "${TUNE_PKGARCH}"
+# le/m64/bs
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift
+DEFAULTTUNE_virtclass-multilib-libmblem64bs = "microblazele64bs"
+AVAILTUNES += "microblazele64bs"
+BASE_LIB_tune-microblazele64bs = "lib/le/m64/bs"
+TUNE_FEATURES_tune-microblazele64bs = "microblaze 64-bit barrel-shift"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bs = "${TUNE_PKGARCH}"
+# le/m64/p
+# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmblem64p = "microblazele64p"
+AVAILTUNES += "microblazele64p"
+BASE_LIB_tune-microblazele64p = "lib/le/m64/p"
+TUNE_FEATURES_tune-microblazele64p = "microblaze 64-bit pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64p = "${TUNE_PKGARCH}"
+# le/m64/m
+# CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblem64m = "microblazele64m"
+AVAILTUNES += "microblazele64m"
+BASE_LIB_tune-microblazele64m = "lib/le/m64/m"
+TUNE_FEATURES_tune-microblazele64m = "microblaze 64-bit multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64m = "${TUNE_PKGARCH}"
+# le/m64/fpd
+# CFLAGS: -mlittle-endian -m64 -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64fpd = "microblazele64fpd"
+AVAILTUNES += "microblazele64fpd"
+BASE_LIB_tune-microblazele64fpd = "lib/le/m64/fpd"
+TUNE_FEATURES_tune-microblazele64fpd = "microblaze 64-bit fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64fpd = "${TUNE_PKGARCH}"
+# le/m64/m/fpd
+# CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64mfpd = "microblazele64mfpd"
+AVAILTUNES += "microblazele64mfpd"
+BASE_LIB_tune-microblazele64mfpd = "lib/le/m64/m/fpd"
+TUNE_FEATURES_tune-microblazele64mfpd = "microblaze 64-bit multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64mfpd = "${TUNE_PKGARCH}"
+# le/m64/p/m
+# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblem64pm = "microblazele64pm"
+AVAILTUNES += "microblazele64pm"
+BASE_LIB_tune-microblazele64pm = "lib/le/m64/p/m"
+TUNE_FEATURES_tune-microblazele64pm = "microblaze 64-bit pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64pm = "${TUNE_PKGARCH}"
+# le/m64/p/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64pfpd = "microblazele64pfpd"
+AVAILTUNES += "microblazele64pfpd"
+BASE_LIB_tune-microblazele64pfpd = "lib/le/m64/p/fpd"
+TUNE_FEATURES_tune-microblazele64pfpd = "microblaze 64-bit pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64pfpd = "${TUNE_PKGARCH}"
+# le/m64/p/m/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64pmfpd = "microblazele64pmfpd"
+AVAILTUNES += "microblazele64pmfpd"
+BASE_LIB_tune-microblazele64pmfpd = "lib/le/m64/p/m/fpd"
+TUNE_FEATURES_tune-microblazele64pmfpd = "microblaze 64-bit pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64pmfpd = "${TUNE_PKGARCH}"
+# le/m64/bs/p
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare
+DEFAULTTUNE_virtclass-multilib-libmblem64bsp = "microblazele64bsp"
+AVAILTUNES += "microblazele64bsp"
+BASE_LIB_tune-microblazele64bsp = "lib/le/m64/bs/p"
+TUNE_FEATURES_tune-microblazele64bsp = "microblaze 64-bit barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bsp = "${TUNE_PKGARCH}"
+# le/m64/bs/m
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblem64bsm = "microblazele64bsm"
+AVAILTUNES += "microblazele64bsm"
+BASE_LIB_tune-microblazele64bsm = "lib/le/m64/bs/m"
+TUNE_FEATURES_tune-microblazele64bsm = "microblaze 64-bit barrel-shift multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bsm = "${TUNE_PKGARCH}"
+# le/m64/bs/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64bsfpd = "microblazele64bsfpd"
+AVAILTUNES += "microblazele64bsfpd"
+BASE_LIB_tune-microblazele64bsfpd = "lib/le/m64/bs/fpd"
+TUNE_FEATURES_tune-microblazele64bsfpd = "microblaze 64-bit barrel-shift fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bsfpd = "${TUNE_PKGARCH}"
+# le/m64/bs/m/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64bsmfpd = "microblazele64bsmfpd"
+AVAILTUNES += "microblazele64bsmfpd"
+BASE_LIB_tune-microblazele64bsmfpd = "lib/le/m64/bs/m/fpd"
+TUNE_FEATURES_tune-microblazele64bsmfpd = "microblaze 64-bit barrel-shift multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bsmfpd = "${TUNE_PKGARCH}"
+# le/m64/bs/p/m
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
+DEFAULTTUNE_virtclass-multilib-libmblem64bspm = "microblazele64bspm"
+AVAILTUNES += "microblazele64bspm"
+BASE_LIB_tune-microblazele64bspm = "lib/le/m64/bs/p/m"
+TUNE_FEATURES_tune-microblazele64bspm = "microblaze 64-bit barrel-shift pattern-compare multiply-low"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bspm = "${TUNE_PKGARCH}"
+# le/m64/bs/p/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64bspfpd = "microblazele64bspfpd"
+AVAILTUNES += "microblazele64bspfpd"
+BASE_LIB_tune-microblazele64bspfpd = "lib/le/m64/bs/p/fpd"
+TUNE_FEATURES_tune-microblazele64bspfpd = "microblaze 64-bit barrel-shift pattern-compare fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bspfpd = "${TUNE_PKGARCH}"
+# le/m64/bs/p/m/fpd
+# CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
+DEFAULTTUNE_virtclass-multilib-libmblem64bspmfpd = "microblazele64bspmfpd"
+AVAILTUNES += "microblazele64bspmfpd"
+BASE_LIB_tune-microblazele64bspmfpd = "lib/le/m64/bs/p/m/fpd"
+TUNE_FEATURES_tune-microblazele64bspmfpd = "microblaze 64-bit barrel-shift pattern-compare multiply-low fpu-hard"
+PACKAGE_EXTRA_ARCHS_tune-microblazele64bspmfpd = "${TUNE_PKGARCH}"
diff --git a/meta-xilinx-standalone/conf/machine/versal-mb.conf b/meta-xilinx-standalone/conf/machine/versal-mb.conf
new file mode 100644
index 00000000..f40b8bca
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/versal-mb.conf
@@ -0,0 +1,10 @@
+DEFAULTTUNE ?= "microblaze"
+require conf/machine/include/soc-versal.inc
+# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
+AVAILTUNES += "microblaze"
+TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+LINKER_HASH_STYLE_microblaze = ""
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
deleted file mode 100644
index 9b5bb110..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil xilstandalone xiltimer freertos10-xilinx device-tree"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_hello_world* ${D}/${base_libdir}/firmware
-}
-FREERTOS_HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_HELLO_WORLD_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf 
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_hello_world.bin ${DEPLOYDIR}/${FREERTOS_HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${FREERTOS_HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
deleted file mode 100644
index ebfc85aa..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native freertos10-xilinx"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_echo* ${D}/${base_libdir}/firmware
-}
-FREERTOS_LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_LWIP_ECHO_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_echo_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
deleted file mode 100644
index eb199d39..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native freertos10-xilinx"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
deleted file mode 100644
index c2282593..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native freertos10-xilinx"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_tcp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
deleted file mode 100644
index ccf8f09e..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native freertos10-xilinx"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_client.bin ${DEPLOYDIR}/${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb b/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
deleted file mode 100644
index f2c9eaed..00000000
--- a/meta-xilinx-standalone/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native freertos10-xilinx"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/freertos_lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/freertos_lwip_udp_perf_server.bin ${DEPLOYDIR}/${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${FREERTOS_LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone/recipes-applications/hello-world/hello-world_git.bb b/meta-xilinx-standalone/recipes-applications/hello-world/hello-world_git.bb
deleted file mode 100644
index c67fb5f5..00000000
--- a/meta-xilinx-standalone/recipes-applications/hello-world/hello-world_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_apps/hello_world/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil xiltimer device-tree"
-inherit python3native
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/hello_world* ${D}/${base_libdir}/firmware
-}
-HELLO_WORLD_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-HELLO_WORLD_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.elf
-    ln -sf ${HELLO_WORLD_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/hello_world.elf ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/hello_world.bin ${DEPLOYDIR}/${HELLO_WORLD_BASE_NAME}.bin
-    ln -sf ${HELLO_WORLD_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb b/meta-xilinx-standalone/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
deleted file mode 100644
index e0d6f13c..00000000
--- a/meta-xilinx-standalone/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_echo* ${D}/${base_libdir}/firmware
-}
-LWIP_ECHO_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-LWIP_ECHO_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.elf
-    ln -sf ${LWIP_ECHO_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_echo.bin ${DEPLOYDIR}/${LWIP_ECHO_BASE_NAME}.bin
-    ln -sf ${LWIP_ECHO_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
deleted file mode 100644
index 6f0c9b4a..00000000
--- a/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_tcp_perf_client* ${D}/${base_libdir}/firmware
-}
-LWIP_TCP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-LWIP_TCP_PERF_CLIENT_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_client.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
deleted file mode 100644
index d9f990c4..00000000
--- a/meta-xilinx-standalone/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_tcp_perf_server* ${D}/${base_libdir}/firmware
-}
-LWIP_TCP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-LWIP_TCP_PERF_SERVER_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_tcp_perf_server.bin ${DEPLOYDIR}/${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_TCP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb b/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
deleted file mode 100644
index fc89c13e..00000000
--- a/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_udp_perf_client* ${D}/${base_libdir}/firmware
-}
-LWIP_UDP_PERF_CLIENT_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-LWIP_UDP_PERF_CLIENT_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_client.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_CLIENT_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb b/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
deleted file mode 100644
index 8b9114ac..00000000
--- a/meta-xilinx-standalone/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-inherit esw deploy python3native
-ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
-DEPENDS += "dtc-native python3-dtc-native libxil lwip xiltimer device-tree python3-pyyaml-native"
-do_configure_prepend() {
-    cd ${S}
-    nativepython3 ${S}/scripts/linker_gen.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_generate_app_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-addtask do_generate_app_data before do_configure after do_prepare_recipe_sysroot
-do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/lwip_udp_perf_server* ${D}/${base_libdir}/firmware
-}
-LWIP_UDP_PERF_SERVER_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-LWIP_UDP_PERF_SERVER_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.elf ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/lwip_udp_perf_server.bin ${DEPLOYDIR}/${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin
-    ln -sf ${LWIP_UDP_PERF_SERVER_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb b/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb
deleted file mode 100644
index 19238f97..00000000
--- a/meta-xilinx-standalone/recipes-applications/pmufw/pmufw_git.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-inherit esw deploy
-COMPATIBLE_MACHINE = "microblaze-pmu"
-ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
-DEPENDS += "xilstandalone xiltimer xilfpga xilskey"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/pmufw* ${D}/${base_libdir}/firmware
-}
-PMU_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PMU_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/pmufw.elf ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PMU_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/pmufw.elf ${WORKDIR}/package/${base_libdir}/firmware/pmufw.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/pmufw.bin ${DEPLOYDIR}/${PMU_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PMU_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/pmufw*"
diff --git a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb b/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
deleted file mode 100644
index a0d2d2b9..00000000
--- a/meta-xilinx-standalone/recipes-applications/zynqmp-fsbl/zynqmp-fsbl_git.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-inherit esw deploy
-COMPATIBLE_MACHINE = ".*-zynqmp"
-ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_fsbl/src"
-DEPENDS += "xilstandalone xiltimer xilffs xilsecure xilpm device-tree"
-PSU_INIT = "${RECIPE_SYSROOT}/${includedir}/devicetree/psu_init*"
-do_configure_prepend() {
-    # Copy psu_init* files to fsbl source code
-    cp ${PSU_INIT} ${S}/${ESW_COMPONENT_SRC}
-}
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/zynqmp_fsbl* ${D}/${base_libdir}/firmware
-}
-ZYNQMP_FSBL_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-ZYNQMP_FSBL_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/zynqmp_fsbl.elf ${DEPLOYDIR}/${ZYNQMP_FSBL_BASE_NAME}.elf
-    ln -sf ${ZYNQMP_FSBL_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/zynqmp_fsbl.elf ${WORKDIR}/package/${base_libdir}/firmware/zynqmp_fsbl.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/zynqmp_fsbl.bin ${DEPLOYDIR}/${ZYNQMP_FSBL_BASE_NAME}.bin
-    ln -sf ${ZYNQMP_FSBL_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-CFLAGS_append_aarch64 = " -DARMA53_64"
-CFLAGS_append_armrm = " -DARMR5"
-FILES_${PN} = "${base_libdir}/firmware/zynqmp_fsbl*"
diff --git a/meta-xilinx-standalone/recipes-drivers/axicdma_git.bb b/meta-xilinx-standalone/recipes-drivers/axicdma_git.bb
deleted file mode 100644
index 442ffb7b..00000000
--- a/meta-xilinx-standalone/recipes-drivers/axicdma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axicdma/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/axidma_git.bb b/meta-xilinx-standalone/recipes-drivers/axidma_git.bb
deleted file mode 100644
index 05f4c342..00000000
--- a/meta-xilinx-standalone/recipes-drivers/axidma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axidma/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/axiethernet_git.bb b/meta-xilinx-standalone/recipes-drivers/axiethernet_git.bb
deleted file mode 100644
index 1dc83406..00000000
--- a/meta-xilinx-standalone/recipes-drivers/axiethernet_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axiethernet/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/axivdma_git.bb b/meta-xilinx-standalone/recipes-drivers/axivdma_git.bb
deleted file mode 100644
index 415cb9b4..00000000
--- a/meta-xilinx-standalone/recipes-drivers/axivdma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/axivdma/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/can_git.bb b/meta-xilinx-standalone/recipes-drivers/can_git.bb
deleted file mode 100644
index 3f688c3b..00000000
--- a/meta-xilinx-standalone/recipes-drivers/can_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/can/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/canfd_git.bb b/meta-xilinx-standalone/recipes-drivers/canfd_git.bb
deleted file mode 100644
index 36fa367b..00000000
--- a/meta-xilinx-standalone/recipes-drivers/canfd_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/canfd/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/canps_git.bb b/meta-xilinx-standalone/recipes-drivers/canps_git.bb
deleted file mode 100644
index ab6f6478..00000000
--- a/meta-xilinx-standalone/recipes-drivers/canps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/canps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/clockps_git.bb b/meta-xilinx-standalone/recipes-drivers/clockps_git.bb
deleted file mode 100644
index b0bb1ccb..00000000
--- a/meta-xilinx-standalone/recipes-drivers/clockps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/clockps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/csudma_git.bb b/meta-xilinx-standalone/recipes-drivers/csudma_git.bb
deleted file mode 100644
index f505a8af..00000000
--- a/meta-xilinx-standalone/recipes-drivers/csudma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/csudma/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/devcfg_git.bb b/meta-xilinx-standalone/recipes-drivers/devcfg_git.bb
deleted file mode 100644
index 04414465..00000000
--- a/meta-xilinx-standalone/recipes-drivers/devcfg_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/devcfg/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/dmaps_git.bb b/meta-xilinx-standalone/recipes-drivers/dmaps_git.bb
deleted file mode 100644
index 0891fb86..00000000
--- a/meta-xilinx-standalone/recipes-drivers/dmaps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/dmaps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/emaclite_git.bb b/meta-xilinx-standalone/recipes-drivers/emaclite_git.bb
deleted file mode 100644
index 927bc93b..00000000
--- a/meta-xilinx-standalone/recipes-drivers/emaclite_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emaclite/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/emacps_git.bb b/meta-xilinx-standalone/recipes-drivers/emacps_git.bb
deleted file mode 100644
index 530087a4..00000000
--- a/meta-xilinx-standalone/recipes-drivers/emacps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/emacps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/gpio_git.bb b/meta-xilinx-standalone/recipes-drivers/gpio_git.bb
deleted file mode 100644
index 8302d66d..00000000
--- a/meta-xilinx-standalone/recipes-drivers/gpio_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/gpio/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/gpiops_git.bb b/meta-xilinx-standalone/recipes-drivers/gpiops_git.bb
deleted file mode 100644
index 9ece49a9..00000000
--- a/meta-xilinx-standalone/recipes-drivers/gpiops_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/gpiops/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/ipipsu_git.bb b/meta-xilinx-standalone/recipes-drivers/ipipsu_git.bb
deleted file mode 100644
index 83a107eb..00000000
--- a/meta-xilinx-standalone/recipes-drivers/ipipsu_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ipipsu/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/llfifo_git.bb b/meta-xilinx-standalone/recipes-drivers/llfifo_git.bb
deleted file mode 100644
index dbc1945f..00000000
--- a/meta-xilinx-standalone/recipes-drivers/llfifo_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/llfifo/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/mbox_git.bb b/meta-xilinx-standalone/recipes-drivers/mbox_git.bb
deleted file mode 100644
index 085a459e..00000000
--- a/meta-xilinx-standalone/recipes-drivers/mbox_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mbox/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/mcdma_git.bb b/meta-xilinx-standalone/recipes-drivers/mcdma_git.bb
deleted file mode 100644
index 4b45d003..00000000
--- a/meta-xilinx-standalone/recipes-drivers/mcdma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mcdma/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/mutex_git.bb b/meta-xilinx-standalone/recipes-drivers/mutex_git.bb
deleted file mode 100644
index 6a7b39b4..00000000
--- a/meta-xilinx-standalone/recipes-drivers/mutex_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/mutex/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/nandpsu_git.bb b/meta-xilinx-standalone/recipes-drivers/nandpsu_git.bb
deleted file mode 100644
index 8fd7251b..00000000
--- a/meta-xilinx-standalone/recipes-drivers/nandpsu_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/nandpsu/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/ospipsv_git.bb b/meta-xilinx-standalone/recipes-drivers/ospipsv_git.bb
deleted file mode 100644
index b98f9b51..00000000
--- a/meta-xilinx-standalone/recipes-drivers/ospipsv_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ospipsv/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/qspips_git.bb b/meta-xilinx-standalone/recipes-drivers/qspips_git.bb
deleted file mode 100644
index 1f0a1240..00000000
--- a/meta-xilinx-standalone/recipes-drivers/qspips_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/qspips/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/qspipsu_git.bb b/meta-xilinx-standalone/recipes-drivers/qspipsu_git.bb
deleted file mode 100644
index f1c97e97..00000000
--- a/meta-xilinx-standalone/recipes-drivers/qspipsu_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/qspipsu/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/resetps_git.bb b/meta-xilinx-standalone/recipes-drivers/resetps_git.bb
deleted file mode 100644
index 51e4eaad..00000000
--- a/meta-xilinx-standalone/recipes-drivers/resetps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/resetps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/rtcpsu_git.bb b/meta-xilinx-standalone/recipes-drivers/rtcpsu_git.bb
deleted file mode 100644
index 19f17f73..00000000
--- a/meta-xilinx-standalone/recipes-drivers/rtcpsu_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/rtcpsu/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/scugic_git.bb b/meta-xilinx-standalone/recipes-drivers/scugic_git.bb
deleted file mode 100644
index f20c8241..00000000
--- a/meta-xilinx-standalone/recipes-drivers/scugic_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/scugic/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/sdps_git.bb b/meta-xilinx-standalone/recipes-drivers/sdps_git.bb
deleted file mode 100644
index cba4543c..00000000
--- a/meta-xilinx-standalone/recipes-drivers/sdps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sdps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/spips_git.bb b/meta-xilinx-standalone/recipes-drivers/spips_git.bb
deleted file mode 100644
index d1395a1e..00000000
--- a/meta-xilinx-standalone/recipes-drivers/spips_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/spips/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/sysmon_git.bb b/meta-xilinx-standalone/recipes-drivers/sysmon_git.bb
deleted file mode 100644
index cc10bbc1..00000000
--- a/meta-xilinx-standalone/recipes-drivers/sysmon_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/sysmon/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/tmrctr_git.bb b/meta-xilinx-standalone/recipes-drivers/tmrctr_git.bb
deleted file mode 100644
index 2e675fb7..00000000
--- a/meta-xilinx-standalone/recipes-drivers/tmrctr_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/tmrctr/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/ttcps_git.bb b/meta-xilinx-standalone/recipes-drivers/ttcps_git.bb
deleted file mode 100644
index 72a21566..00000000
--- a/meta-xilinx-standalone/recipes-drivers/ttcps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/ttcps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/uartlite_git.bb b/meta-xilinx-standalone/recipes-drivers/uartlite_git.bb
deleted file mode 100644
index 0f6d688f..00000000
--- a/meta-xilinx-standalone/recipes-drivers/uartlite_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartlite/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/uartps_git.bb b/meta-xilinx-standalone/recipes-drivers/uartps_git.bb
deleted file mode 100644
index e898f011..00000000
--- a/meta-xilinx-standalone/recipes-drivers/uartps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/usbpsu_git.bb b/meta-xilinx-standalone/recipes-drivers/usbpsu_git.bb
deleted file mode 100644
index 97645375..00000000
--- a/meta-xilinx-standalone/recipes-drivers/usbpsu_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/usbpsu/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/wdtps_git.bb b/meta-xilinx-standalone/recipes-drivers/wdtps_git.bb
deleted file mode 100644
index de70d5fc..00000000
--- a/meta-xilinx-standalone/recipes-drivers/wdtps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/wdtps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/xadcps_git.bb b/meta-xilinx-standalone/recipes-drivers/xadcps_git.bb
deleted file mode 100644
index 2e607521..00000000
--- a/meta-xilinx-standalone/recipes-drivers/xadcps_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/xadcps/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/xxvethernet_git.bb b/meta-xilinx-standalone/recipes-drivers/xxvethernet_git.bb
deleted file mode 100644
index 66e6bcd6..00000000
--- a/meta-xilinx-standalone/recipes-drivers/xxvethernet_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/xxvethernet/examples/"
diff --git a/meta-xilinx-standalone/recipes-drivers/zdma_git.bb b/meta-xilinx-standalone/recipes-drivers/zdma_git.bb
deleted file mode 100644
index 584a1b20..00000000
--- a/meta-xilinx-standalone/recipes-drivers/zdma_git.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-inherit esw_examples
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/zdma/examples/"
diff --git a/meta-xilinx-standalone/recipes-libraries/freertos10-xilinx_git.bb b/meta-xilinx-standalone/recipes-libraries/freertos10-xilinx_git.bb
deleted file mode 100644
index 870524d2..00000000
--- a/meta-xilinx-standalone/recipes-libraries/freertos10-xilinx_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit esw python3native
-ESW_COMPONENT_SRC = "/ThirdParty/bsp/freertos10_xilinx/src/"
-ESW_COMPONENT_NAME = "libfreertos.a"
-DEPENDS += "libxil xilstandalone xilmem dtc-native python3-pyyaml-native python3-dtc-native xiltimer"
-do_configure_prepend() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH} 
-}
diff --git a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone/recipes-libraries/libxil_git.bb
deleted file mode 100644
index 4ac7c115..00000000
--- a/meta-xilinx-standalone/recipes-libraries/libxil_git.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-inherit esw python3native
-ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
-ESW_COMPONENT_NAME = "libxil.a"
-DEPENDS += "dtc-native python3-dtc-native python3-pyyaml-native xilstandalone xilmem device-tree"
-do_configure_prepend() {
-    # This will generate CMakeLists.txt which contains
-    # drivers for the libxil 
-    cd ${S}
-    #TODO
-    # This call was initially used to get the list of drivers and libraries required
-    # by the design to the build system to use as dependencies to the application
-    # being built, at this point this is all done in a single cmake build bundling
-    # everything in libxil, which is undesired.
-    DRIVERS_LIST=$(nativepython3 ${S}/scripts/getdrvlist.py -d ${DTBFILE})
-}
-do_generate_driver_data() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/generate_drvdata.py -d ${DTBFILE}
-}
-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/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone/recipes-libraries/lwip_git.bb
deleted file mode 100644
index 7e31b32e..00000000
--- a/meta-xilinx-standalone/recipes-libraries/lwip_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit esw python3native
-ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/"
-ESW_COMPONENT_NAME = "liblwip211.a"
-DEPENDS += "dtc-native python3-dtc-native libxil python3-pyyaml-native"
-DEPENDS_append_xilinx-freertos = "freertos10-xilinx"
-do_configure_prepend() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
-do_install() {
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-    install -m 0755  ${B}/${ESW_COMPONENT_NAME} ${D}${libdir}
-    install -m 0644  ${B}/include/*.h ${D}${includedir}
-    cp -r ${B}/include/arch/ ${D}${includedir}
-    cp -r ${B}/include/include/lwip/ ${D}${includedir}
-    cp -r ${B}/include/include/netif/ ${D}${includedir}
-}
diff --git a/meta-xilinx-standalone/recipes-libraries/xilffs_git.bb b/meta-xilinx-standalone/recipes-libraries/xilffs_git.bb
deleted file mode 100644
index fdfbb7cf..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilffs_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/src/"
-ESW_COMPONENT_NAME = "libxilffs.a"
-EXTRA_OECMAKE += "-DXILFFS_use_mkfs=OFF"
-EXTRA_OECMAKE += "-DXILFFS_read_only=ON"
-EXTRA_OECMAKE += "-DXILFFS_word_access=OFF"
-DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilfpga_git.bb b/meta-xilinx-standalone/recipes-libraries/xilfpga_git.bb
deleted file mode 100644
index 41405fdf..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilfpga_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilfpga/src/"
-ESW_COMPONENT_NAME = "libxilfpga.a"
-DEPENDS += " libxil xilsecure"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilloader_git.bb b/meta-xilinx-standalone/recipes-libraries/xilloader_git.bb
deleted file mode 100644
index 682908ad..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilloader_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilloader/src/"
-ESW_COMPONENT_NAME = "libxilloader.a"
-DEPENDS += "xilstandalone libxil xilpm xilpdi xilffs xilsecure xilpuf"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilmailbox_git.bb b/meta-xilinx-standalone/recipes-libraries/xilmailbox_git.bb
deleted file mode 100644
index ff61d95d..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilmailbox_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/src/"
-ESW_COMPONENT_NAME = "libxilmailbox.a"
-DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilmem_git.bb b/meta-xilinx-standalone/recipes-libraries/xilmem_git.bb
deleted file mode 100644
index de942540..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilmem_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilmem/src/"
-ESW_COMPONENT_NAME = "libxilmem.a"
-DEPENDS += "xilstandalone"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilpdi_git.bb b/meta-xilinx-standalone/recipes-libraries/xilpdi_git.bb
deleted file mode 100644
index c008b069..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilpdi_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilpdi/src/"
-ESW_COMPONENT_NAME = "libxilpdi.a"
-DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb b/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb
deleted file mode 100644
index e866e98f..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilplmi_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilplmi/src/"
-ESW_COMPONENT_NAME = "libxilplmi.a"
-DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb b/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb
deleted file mode 100644
index 80132c90..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilpm_git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilpm/src/"
-ESW_COMPONENT_NAME = "libxilpm.a"
-DEPENDS = "libxil"
-DEPENDS_microblaze-plm_append = "xilplmi"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilpuf_git.bb b/meta-xilinx-standalone/recipes-libraries/xilpuf_git.bb
deleted file mode 100644
index 31f06288..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilpuf_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/src/"
-ESW_COMPONENT_NAME = "libxilpuf.a"
-DEPENDS += "libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilsecure_git.bb b/meta-xilinx-standalone/recipes-libraries/xilsecure_git.bb
deleted file mode 100644
index 0ad55510..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilsecure_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/src/"
-ESW_COMPONENT_NAME = "libxilsecure.a"
-DEPENDS += "libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilsem_git.bb b/meta-xilinx-standalone/recipes-libraries/xilsem_git.bb
deleted file mode 100644
index 3631d7f0..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilsem_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilsem/src/"
-ESW_COMPONENT_NAME = "libxilsem.a"
-DEPENDS += "xilstandalone libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilskey_git.bb b/meta-xilinx-standalone/recipes-libraries/xilskey_git.bb
deleted file mode 100644
index 84782554..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilskey_git.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit esw
-ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/src/"
-ESW_COMPONENT_NAME = "libxilskey.a"
-DEPENDS += "libxil"
diff --git a/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb
deleted file mode 100644
index a4a393c3..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xilstandalone_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit esw python3native
-ESW_COMPONENT_SRC = "/lib/bsp/standalone/src/"
-ESW_COMPONENT_NAME = "libxilstandalone.a"
-DEPENDS += "dtc-native python3-dtc-native python3-pyyaml-native libgloss device-tree"
-do_configure_prepend() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/generate_libdata.py -d ${DTBFILE}
-}
diff --git a/meta-xilinx-standalone/recipes-libraries/xiltimer_git.bb b/meta-xilinx-standalone/recipes-libraries/xiltimer_git.bb
deleted file mode 100644
index 428fa686..00000000
--- a/meta-xilinx-standalone/recipes-libraries/xiltimer_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-inherit esw python3native
-ESW_COMPONENT_SRC = "/lib/sw_services/xiltimer/src/"
-ESW_COMPONENT_NAME = "libxiltimer.a"
-DEPENDS += "dtc-native python3-dtc-native python3-pyyaml-native libxil device-tree"
-do_configure_prepend() {
-    # This script should also not rely on relative paths and such
-    cd ${S}
-    nativepython3 ${S}/scripts/lib_parser.py -d ${DTBFILE} -o ${OECMAKE_SOURCEPATH}
-}
diff --git a/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb b/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb
deleted file mode 100644
index 25988eb9..00000000
--- a/meta-xilinx-standalone/recipes-standalone/plm/plm-standalone_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit esw deploy
-ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
-DEPENDS += "xilstandalone xiltimer xilffs xilpdi xilplmi xilloader xilpm xilsecure xilsem"
-do_install() {
-    install -d ${D}/${base_libdir}/firmware
-    # Note that we have to make the ELF executable for it to be stripped
-    install -m 0755  ${B}/versal_plm* ${D}/${base_libdir}/firmware
-}
-PLM_FIRMWARE_BASE_NAME ?= "${BPN}-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}"
-PLM_FIRMWARE_BASE_NAME[vardepsexclude] = "DATETIME"
-do_deploy() {
-    # Not a huge fan of deploying from package but we want the stripped elf to be deployed.
-    # We could, technically create another task that runs after do_install that strips it but it
-    # seems unnecessarily convoluted, unless there's an objection on performing do_install we
-    # should do it this way since it easier to keep up with changes in oe-core.
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.elf
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.elf ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/versal_plm.bin ${DEPLOYDIR}/${PLM_FIRMWARE_BASE_NAME}.bin
-    ln -sf ${PLM_FIRMWARE_BASE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}.bin
-}
-addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/plm*"
diff --git a/meta-xilinx-standalone/scripts/microblaze_dtb.py b/meta-xilinx-standalone/scripts/microblaze_dtb.py
deleted file mode 100644
index 1c5ed835..00000000
--- a/meta-xilinx-standalone/scripts/microblaze_dtb.py
+++ /dev/null
@@ -1,170 +0,0 @@
-import argparse
-import libfdt
-import os
-import sys
-# Format: FEATURE : (dtb property, condition_operator, condition_value)
-# If dtb property is None, then the item is always on
-#
-# If the condition_operator is None, then enable if it exists for existance
-#
-# If the condition_operator is '!', and condition_value is None then enable if
-#    if is not defined
-#
-# Otherwise 'condition' and value are evaluated by type.
-#
-# If the condition is = then any value of condition_values will set it
-# If the condition is ! then no value of condition_values will set it
-microblaze_tune_features = {
-  'microblaze' :      (None,                     None, None),
-  'bigendian':        ('xlnx,endianness',        '!', 1),
-  '64-bit' :          ('xlnx,data-size',         '=', 64),
-  'barrel-shift':     ('xlnx,use-barrel',        '=', 1),
-  'pattern-compare':  ('xlnx,use-pcmp-instr',    '=', 1),
-  'reorder'   :       ('xlnx,use-reorder-instr', '!', 0),
-  'frequency-optimized': ('xlnx,area-optimized', '=', 2),
-  'multiply-low':     ('xlnx,use-hw-mul',        '=', 1),
-  'multiply-high':    ('xlnx,use-hw-mul',        '=', 2),
-  'divide-hard':      ('xlnx,use-div',           '=', 1),
-  'fpu-soft':         ('xlnx,use-fpu',           '!', [1,2]),
-  'fpu-hard':         ('xlnx,use-fpu',           '=', 1),
-  'fpu-hard-extended':('xlnx,use-fpu',           '=', 2),
-}
-def processProperties(fdt, node):
-    TUNE_FEATURES = []
-    for feature in microblaze_tune_features:
-        (property, cop, cvalue) = microblaze_tune_features[feature]
-        if not property:
-            TUNE_FEATURES.append(feature)
-            # Special processing to get the version
-            if feature == "microblaze":
-                ver = microblazeVersion(fdt, node)
-                if ver:
-                    TUNE_FEATURES.append(ver)
-            continue
-        prop_value = fdt.getprop( node, property, libfdt.QUIET_NOTFOUND)
-        if not prop_value or prop_value == -1:
-            if cop == '!':
-                if not cvalue:
-                    TUNE_FEATURES.append(ver)
-                    continue
-            continue
-        # If no operator
-        if not cop or (cop == '=' and not cvalue):
-            TUNE_FEATURES.append(feature)
-            continue
-        ctype = type(cvalue)
-        if ctype == type(list()):
-            val_list = cvalue
-        else:
-            val_list = [ cvalue ]
-        result = False
-        for value in val_list:
-            ctype = type(value)
-            if ctype == type(int()):
-                val = prop_value.as_uint32()
-            else:
-                raise TypeError('Unknown type %s' % ctype)
-            if value == val:
-                result = True
-                break
-            else:
-                result = False
-        if (cop == '!' and result == False) or \
-           (cop == '=' and result == True):
-            TUNE_FEATURES.append(feature)
-    return TUNE_FEATURES
-def microblazeVersion(fdt, node):
-    version = None
-    val = fdt.getprop( node, 'model', libfdt.QUIET_NOTFOUND)
-    if val and val != -1:
-        val = fdt.getprop( node, 'model' ).as_str()
-        version = val[val.find('microblaze,') + 11:]
-        if version.startswith('8'):
-            # Strip 8.xx.y, to just 8.xx
-            v = version.split('.')
-            version = '.'.join(v[0:2])
-        version = 'v' + version
-    return version
-def MicroblazeConfig(dtbfile, out):
-    fdt = libfdt.Fdt(open(dtbfile, mode='rb').read())
-    cpu = -1
-    while (True):
-        cpu = cpu + 1
-        try:
-            node = fdt.path_offset('/cpus/cpu@%d' % cpu)
-            try:
-                prop = fdt.getprop( node, 'compatible' )
-                prop_val = prop[:-1].decode('utf-8').split('\x00')
-                microblaze = False
-                for val in prop_val:
-                    if "microblaze" in val:
-                        microblaze = True
-                        break
-                if not microblaze:
-                    continue
-                # Construct TUNE_FEATURE here
-                TUNE_FEATURES = processProperties(fdt, node)
-                out.write('AVAILTUNES += "microblaze-cpu%s"\n' % (cpu))
-                out.write('TUNE_FEATURES_tune-microblaze-cpu%s = "%s"\n' % (cpu, ' '.join(TUNE_FEATURES)))
-                out.write('PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu%s = "${TUNE_PKGARCH}"\n' % (cpu))
-            except Exception as e:
-                sys.stderr.write("Exception looking at properties: %s\n" % e)
-                continue
-        except Exception as e:
-            # CPUs SHOULD be consecutive w/o gaps, so no more to search
-            break
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='Generate MicroBlaze TUNE_FEATURES')
-    parser.add_argument('-d', '--dtb-file', action='store',
-        help='DTB file to process')
-    parser.add_argument('-o', '--output', action='store',
-        help='Output file to store TUNE_FEATURE settings')
-    args = parser.parse_args()
-    if not args.dtb_file:
-        sys.stderr.write('ERROR: You must specify a DTB_FILE to process.\n')
-        sys.exit(1)
-    outputf = sys.stdout
-    if args.output:
-        if os.path.exists(args.output):
-            sys.stderr.write('ERROR: The output file "%s" exists!\n' % args.output)
-            sys.exit(1)
-        outputf = open(args.output, 'w')
-    MicroblazeConfig(args.dtb_file, outputf)