diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2463f993f..ec1bd8029 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2023.08] - 2023-XX-XX
+
+### Changed
+
+- Move projects to toplevel conf directory
+- Implement new project detection logic in envsetup
+
+### Added
+
 ## [2023.07] - 2023-07-31
 
 ### Changed
diff --git a/conf/bblayers.conf b/conf/bblayers.conf
index 6239843fa..63505ab23 100644
--- a/conf/bblayers.conf
+++ b/conf/bblayers.conf
@@ -3,7 +3,7 @@
 LCONF_VERSION = "7"
 #TOPDIR := "${@os.path.dirname(os.path.dirname(d.getVar('FILE', True)))}"
 
-require ${TOPDIR}/sources/meta-yoe/conf/projects/${PROJECT}/layers.conf
+require ${TOPDIR}/conf/projects/${PROJECT}/layers.conf
 
 # Placeholder for devtool adding layers as it does not understand above
 # location for finding BBLAYERS
diff --git a/sources/meta-yoe/conf/projects/beaglebone/config.conf b/conf/projects/beaglebone/config.conf
similarity index 92%
rename from sources/meta-yoe/conf/projects/beaglebone/config.conf
rename to conf/projects/beaglebone/config.conf
index ef8b92b13..9c1fa6e8e 100644
--- a/sources/meta-yoe/conf/projects/beaglebone/config.conf
+++ b/conf/projects/beaglebone/config.conf
@@ -29,6 +29,9 @@ SIMPLECLIENTS:ti-soc = "damage,im,egl,shm,touch,dmabuf-v4l,dmabuf-egl"
 # Do not need it if PREFERRED_PROVIDER_virtual/kernel is not "linux-bb.org"
 OLDEST_KERNEL = "5.10"
 
+# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table
+OBJCOPY:pn-linux-ti-staging:toolchain-clang = "${HOST_PREFIX}objcopy"
+
 # Needed for Running bitbake -ctestimage <image>
 #TEST_TARGET_IP = "10.0.0.34"
 #TEST_SERVER_IP = "10.0.0.13"
diff --git a/sources/meta-yoe/conf/projects/beaglebone/layers.conf b/conf/projects/beaglebone/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/beaglebone/layers.conf
rename to conf/projects/beaglebone/layers.conf
diff --git a/sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/config.conf b/conf/projects/imx8mm-ddr4-evk/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/config.conf
rename to conf/projects/imx8mm-ddr4-evk/config.conf
diff --git a/sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/layers.conf b/conf/projects/imx8mm-ddr4-evk/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/imx8mm-ddr4-evk/layers.conf
rename to conf/projects/imx8mm-ddr4-evk/layers.conf
diff --git a/sources/meta-yoe/conf/projects/nezha-d1/config.conf b/conf/projects/nezha-d1/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/nezha-d1/config.conf
rename to conf/projects/nezha-d1/config.conf
diff --git a/sources/meta-yoe/conf/projects/nezha-d1/layers.conf b/conf/projects/nezha-d1/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/nezha-d1/layers.conf
rename to conf/projects/nezha-d1/layers.conf
diff --git a/sources/meta-yoe/conf/projects/odroid-c4/config.conf b/conf/projects/odroid-c4/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/odroid-c4/config.conf
rename to conf/projects/odroid-c4/config.conf
diff --git a/sources/meta-yoe/conf/projects/odroid-c4/layers.conf b/conf/projects/odroid-c4/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/odroid-c4/layers.conf
rename to conf/projects/odroid-c4/layers.conf
diff --git a/conf/projects/qemuarm/config.conf b/conf/projects/qemuarm/config.conf
new file mode 100644
index 000000000..6ead55bef
--- /dev/null
+++ b/conf/projects/qemuarm/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuarm"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemuarm/layers.conf b/conf/projects/qemuarm/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemuarm/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/conf/projects/qemuarm64/config.conf b/conf/projects/qemuarm64/config.conf
new file mode 100644
index 000000000..bb12cc721
--- /dev/null
+++ b/conf/projects/qemuarm64/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuarm64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemuarm64/layers.conf b/conf/projects/qemuarm64/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemuarm64/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemucommon/config.conf b/conf/projects/qemucommon/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/qemucommon/config.conf
rename to conf/projects/qemucommon/config.conf
diff --git a/sources/meta-yoe/conf/projects/qemucommon/layers.conf b/conf/projects/qemucommon/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/qemucommon/layers.conf
rename to conf/projects/qemucommon/layers.conf
diff --git a/conf/projects/qemumips/config.conf b/conf/projects/qemumips/config.conf
new file mode 100644
index 000000000..6e3562f37
--- /dev/null
+++ b/conf/projects/qemumips/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemumips"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemumips/layers.conf b/conf/projects/qemumips/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemumips/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/conf/projects/qemuppc/config.conf b/conf/projects/qemuppc/config.conf
new file mode 100644
index 000000000..883dcd130
--- /dev/null
+++ b/conf/projects/qemuppc/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuppc"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemuppc/layers.conf b/conf/projects/qemuppc/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemuppc/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/conf/projects/qemuppc64/config.conf b/conf/projects/qemuppc64/config.conf
new file mode 100644
index 000000000..4934de647
--- /dev/null
+++ b/conf/projects/qemuppc64/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuppc64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemuppc64/layers.conf b/conf/projects/qemuppc64/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemuppc64/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/conf/projects/qemuriscv32/config.conf b/conf/projects/qemuriscv32/config.conf
new file mode 100644
index 000000000..37cc5c969
--- /dev/null
+++ b/conf/projects/qemuriscv32/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuriscv32"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/sources/meta-yoe/conf/projects/qemuriscv64/layers.conf b/conf/projects/qemuriscv32/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/qemuriscv64/layers.conf
rename to conf/projects/qemuriscv32/layers.conf
diff --git a/conf/projects/qemuriscv64/config.conf b/conf/projects/qemuriscv64/config.conf
new file mode 100644
index 000000000..f1138cd33
--- /dev/null
+++ b/conf/projects/qemuriscv64/config.conf
@@ -0,0 +1,2 @@
+MACHINE = "qemuriscv64"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/sources/meta-yoe/conf/projects/unleashed/layers.conf b/conf/projects/qemuriscv64/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/unleashed/layers.conf
rename to conf/projects/qemuriscv64/layers.conf
diff --git a/conf/projects/qemux86-64/config.conf b/conf/projects/qemux86-64/config.conf
new file mode 100644
index 000000000..b755867d9
--- /dev/null
+++ b/conf/projects/qemux86-64/config.conf
@@ -0,0 +1,3 @@
+MACHINE = "qemux86-64"
+TESTIMAGE_AUTO = "1"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemux86-64/layers.conf b/conf/projects/qemux86-64/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemux86-64/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/conf/projects/qemux86/config.conf b/conf/projects/qemux86/config.conf
new file mode 100644
index 000000000..745ef161e
--- /dev/null
+++ b/conf/projects/qemux86/config.conf
@@ -0,0 +1,3 @@
+MACHINE = "qemux86"
+TESTIMAGE_AUTO = "1"
+require ${TOPDIR}/conf/projects/qemucommon/config.conf
diff --git a/conf/projects/qemux86/layers.conf b/conf/projects/qemux86/layers.conf
new file mode 120000
index 000000000..489683f8c
--- /dev/null
+++ b/conf/projects/qemux86/layers.conf
@@ -0,0 +1 @@
+../qemucommon/layers.conf
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/rockpi-4b/config.conf b/conf/projects/rockpi-4b/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/rockpi-4b/config.conf
rename to conf/projects/rockpi-4b/config.conf
diff --git a/sources/meta-yoe/conf/projects/rockpi-4b/layers.conf b/conf/projects/rockpi-4b/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/rockpi-4b/layers.conf
rename to conf/projects/rockpi-4b/layers.conf
diff --git a/sources/meta-yoe/conf/projects/rpi4-64/config.conf b/conf/projects/rpi4-64/config.conf
similarity index 90%
rename from sources/meta-yoe/conf/projects/rpi4-64/config.conf
rename to conf/projects/rpi4-64/config.conf
index 0001171c6..d3092c148 100644
--- a/sources/meta-yoe/conf/projects/rpi4-64/config.conf
+++ b/conf/projects/rpi4-64/config.conf
@@ -12,6 +12,10 @@ LICENSE_FLAGS_ACCEPTED += "\
     "
 # Enable serial console on Raspberry PI systems
 ENABLE_UART = "1"
+
+# Disable rpi raimbow screen
+DISABLE_SPLASH = "1"
+
 IMAGE_FSTYPES:append = " wic.xz wic.bmap ext4.xz"
 # Yoe Updater Supported Machines ( RPI, beaglebone, C4, SAMA5D27 for now )
 INITRAMFS_IMAGE_BUNDLE = "1"
@@ -27,6 +31,9 @@ IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}"
 IMAGE_BOOT_FILES:remove = "${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${KERNEL_IMAGETYPE}"
 IMAGE_BOOT_FILES:append = " ${KERNEL_IMAGETYPE}-initramfs-${MACHINE}.bin;${SDIMG_KERNELIMAGE}"
 
+# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table
+OBJCOPY:pn-linux-raspberrypi:toolchain-clang = "${HOST_PREFIX}objcopy"
+
 # Needed for Running bitbake -ctestimage <image>
 TEST_TARGET_IP = "10.0.0.47"
 TEST_SERVER_IP = "10.0.0.13"
diff --git a/sources/meta-yoe/conf/projects/rpi4-64/layers.conf b/conf/projects/rpi4-64/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/rpi4-64/layers.conf
rename to conf/projects/rpi4-64/layers.conf
diff --git a/sources/meta-yoe/conf/projects/unleashed/config.conf b/conf/projects/unleashed/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/unleashed/config.conf
rename to conf/projects/unleashed/config.conf
diff --git a/sources/meta-yoe/conf/projects/visionfive/layers.conf b/conf/projects/unleashed/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/visionfive/layers.conf
rename to conf/projects/unleashed/layers.conf
diff --git a/sources/meta-yoe/conf/projects/unmatched/config.conf b/conf/projects/unmatched/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/unmatched/config.conf
rename to conf/projects/unmatched/config.conf
diff --git a/sources/meta-yoe/conf/projects/unmatched/layers.conf b/conf/projects/unmatched/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/unmatched/layers.conf
rename to conf/projects/unmatched/layers.conf
diff --git a/sources/meta-yoe/conf/projects/var-dart-imx6ul/config.conf b/conf/projects/var-dart-imx6ul/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-dart-imx6ul/config.conf
rename to conf/projects/var-dart-imx6ul/config.conf
diff --git a/sources/meta-yoe/conf/projects/var-dart-imx6ul/layers.conf b/conf/projects/var-dart-imx6ul/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-dart-imx6ul/layers.conf
rename to conf/projects/var-dart-imx6ul/layers.conf
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8/config.conf b/conf/projects/var-som-mx8/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-som-mx8/config.conf
rename to conf/projects/var-som-mx8/config.conf
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8/layers.conf b/conf/projects/var-som-mx8/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-som-mx8/layers.conf
rename to conf/projects/var-som-mx8/layers.conf
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf b/conf/projects/var-som-mx8m-nano/config.conf
similarity index 98%
rename from sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf
rename to conf/projects/var-som-mx8m-nano/config.conf
index 32b239481..2bafb0572 100644
--- a/sources/meta-yoe/conf/projects/var-som-mx8m-nano/config.conf
+++ b/conf/projects/var-som-mx8m-nano/config.conf
@@ -1,3 +1,4 @@
+MACHINE = "imx8mn-var-som"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
 YOE_PROFILE = "yoe-glibc-systemd-wayland"
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8m-nano/layers.conf b/conf/projects/var-som-mx8m-nano/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-som-mx8m-nano/layers.conf
rename to conf/projects/var-som-mx8m-nano/layers.conf
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8x/config.conf b/conf/projects/var-som-mx8x/config.conf
similarity index 98%
rename from sources/meta-yoe/conf/projects/var-som-mx8x/config.conf
rename to conf/projects/var-som-mx8x/config.conf
index f03a35437..1030cc503 100644
--- a/sources/meta-yoe/conf/projects/var-som-mx8x/config.conf
+++ b/conf/projects/var-som-mx8x/config.conf
@@ -1,3 +1,4 @@
+MACHINE = "imx8qxp-var-som"
 DISTRO = "yoe"
 # "yoe-<libc>-<init-system>-<windowing-system>"
 YOE_PROFILE = "yoe-glibc-systemd-wayland"
diff --git a/sources/meta-yoe/conf/projects/var-som-mx8x/layers.conf b/conf/projects/var-som-mx8x/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/var-som-mx8x/layers.conf
rename to conf/projects/var-som-mx8x/layers.conf
diff --git a/sources/meta-yoe/conf/projects/visionfive/config.conf b/conf/projects/visionfive/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/visionfive/config.conf
rename to conf/projects/visionfive/config.conf
diff --git a/conf/projects/visionfive/layers.conf b/conf/projects/visionfive/layers.conf
new file mode 100644
index 000000000..7caf048f9
--- /dev/null
+++ b/conf/projects/visionfive/layers.conf
@@ -0,0 +1,25 @@
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS = "\
+    ${TOPDIR}/sources/meta-yoe \
+    \
+    ${TOPDIR}/sources/meta-riscv \
+    \
+    ${TOPDIR}/sources/meta-clang \
+    ${TOPDIR}/sources/meta-elm-binary \
+    ${TOPDIR}/sources/meta-qt5 \
+    \
+    ${TOPDIR}/sources/meta-openembedded/meta-filesystems \
+    ${TOPDIR}/sources/meta-openembedded/meta-gnome \
+    ${TOPDIR}/sources/meta-openembedded/meta-initramfs \
+    ${TOPDIR}/sources/meta-openembedded/meta-multimedia \
+    ${TOPDIR}/sources/meta-openembedded/meta-networking \
+    ${TOPDIR}/sources/meta-openembedded/meta-oe \
+    ${TOPDIR}/sources/meta-openembedded/meta-perl \
+    ${TOPDIR}/sources/meta-openembedded/meta-python \
+    ${TOPDIR}/sources/meta-openembedded/meta-webserver \
+    ${TOPDIR}/sources/meta-openembedded/meta-xfce \
+    \
+    ${TOPDIR}/sources/poky/meta \
+"
diff --git a/sources/meta-yoe/conf/projects/visionfive2/config.conf b/conf/projects/visionfive2/config.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/visionfive2/config.conf
rename to conf/projects/visionfive2/config.conf
diff --git a/sources/meta-yoe/conf/projects/visionfive2/layers.conf b/conf/projects/visionfive2/layers.conf
similarity index 100%
rename from sources/meta-yoe/conf/projects/visionfive2/layers.conf
rename to conf/projects/visionfive2/layers.conf
diff --git a/conf/site.conf b/conf/site.conf
index 28103a386..a1e5b2c71 100644
--- a/conf/site.conf
+++ b/conf/site.conf
@@ -5,7 +5,7 @@
 # SCONF_VERSION is increased each time build/conf/ changes incompatibly
 SCONF_VERSION = "1"
 
-require ${TOPDIR}/sources/meta-yoe/conf/projects/${PROJECT}/config.conf
+require ${TOPDIR}/conf/projects/${PROJECT}/config.conf
 
 # Override default distro profile if needed
 #YOE_PROFILE = "yoe-musl-systemd-wayland"
diff --git a/envsetup.sh b/envsetup.sh
index 2d41d33b0..572b043dd 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -9,7 +9,7 @@ echoerr() {
 # List supported projects
 yoe_get_projects() {
     (
-    cd $OE_BASE/sources/meta-yoe/conf/projects
+    cd $OE_BASE/conf/projects
     for f in *; do
         if [ -e $f/config.conf ]; then
             echo $f
@@ -119,37 +119,19 @@ fi
 export PROJECT
 echo "Setting PROJECT=$PROJECT"
 
-case "$PROJECT" in
-  "rpi4-64")
-    MACHINE=raspberrypi4-64
-    ;;
-  "odroid-c4")
-    MACHINE=odroid-c4-hardkernel
-    ;;
-  "rockpi-4b")
-    MACHINE=rockpi-4-b
-    ;;
-  "var-som-mx8")
-    MACHINE=imx8qm-var-som
-    ;;
-  "var-som-mx8x")
-    MACHINE=imx8qxp-var-som
-    ;;
-  "var-som-mx8m-nano")
-    MACHINE=imx8mn-var-som
-    ;;
-  "nezha-d1")
-    MACHINE=nezha-allwinner-d1
-    ;;
-  "unleashed")
-    MACHINE=freedom-u540
-    ;;
-  "var-dart-imx6ul")
-    MACHINE=imx6ul-var-dart
-    ;;
-  *)
-    MACHINE=$PROJECT
-esac
+MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d '"' -f 2`
+
+if [ -z "$MACHINE" ]; then
+  MACHINE=`cat conf/projects/$PROJECT/config.conf | grep '^MACHINE.*=' | cut -d "'" -f 2`
+fi
+
+if [ -z "$MACHINE" ]; then
+  echo "Please define MACHINE = \"<name>\" in conf/projects/$PROJECT/config.conf"
+  unset PROJECT
+  unset MACHINE
+  return 1
+fi
+
 export MACHINE
 echo "Setting MACHINE=$MACHINE"
 
@@ -481,7 +463,7 @@ yoe_add_layer() {
   fi
   git submodule add -b $br -f $1 sources/$n
   git submodule init sources/$n
-  echo "Add it from project layers.conf files in sources/meta-yoe/conf/projects"
+  echo "Add it from project layers.conf files in conf/projects"
   echo "please commit with - git commit -s -m'Add module $n'"
 }
 
@@ -495,7 +477,7 @@ yoe_remove_layer() {
   bitbake-layers remove-layer $1
   git submodule deinit -f $m
   git rm -r -f $m
-  echo "Remove it from project layers.conf files in sources/meta-yoe/conf/projects"
+  echo "Remove it from project layers.conf files in conf/projects"
   echo "please commit with - git commit -s -m'Remove module $n'"
   rm -rf .git/modules/$m
   #rm -rf $m
diff --git a/sources/meta-yoe/conf/distro/yoe.inc b/sources/meta-yoe/conf/distro/yoe.inc
index 567c6c826..8166cebd8 100644
--- a/sources/meta-yoe/conf/distro/yoe.inc
+++ b/sources/meta-yoe/conf/distro/yoe.inc
@@ -64,10 +64,6 @@ BUILDHISTORY_COMMIT ?= "1"
 # e.g. qtwebkit from 163M down to < 1M
 CMAKE_VERBOSE ?= ""
 
-# the following is required because some BSP layers (fsl) don't set this, and then
-# other BSP layers fail bitbake parsing (ti).
-MACHINE_KERNEL_PR ??= "0"
-
 # account for some layers which have bbappends for layers we dont include
 BB_DANGLINGAPPENDS_WARNONLY = "1"
 
@@ -166,12 +162,6 @@ PREFERRED_VERSION_nativesdk-swig = "4%"
 # other BSP layers fail bitbake parsing (ti).
 MACHINE_KERNEL_PR = "0"
 
-# Enable u-boot for RPI
-#RPI_USE_U_BOOT = "1"
-
-# Disable rpi raimbow screen
-DISABLE_SPLASH = "1"
-
 # swupdate initramfs init system
 SWUPDATE_INIT = "tiny"
 
@@ -193,13 +183,6 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 # Enable persistent logs across reboots
 VOLATILE_LOG_DIR = "no"
 
-# Use gcc for perf temporarily, until oe-core gets it
-TOOLCHAIN:pn-perf = "gcc"
-
-# Subprocess output:arm-yoe-linux-llvm-objcopy: error: Link field value 22 in section .rel.dyn is not a symbol table
-OBJCOPY:pn-linux-raspberrypi:toolchain-clang = "${HOST_PREFIX}objcopy"
-OBJCOPY:pn-linux-ti-staging:toolchain-clang = "${HOST_PREFIX}objcopy"
-
 SKIP_RECIPE[build-appliance-image] = "tries to include whole downloads directory in /home/builder/poky :/"
 SKIP_RECIPE[smartrefrigerator] = "Needs porting to QT > 5.6"
 SKIP_RECIPE[qmlbrowser] = "Needs porting to QT > 5.6"
diff --git a/sources/meta-yoe/conf/projects/qemuarm b/sources/meta-yoe/conf/projects/qemuarm
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemuarm
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemuarm64 b/sources/meta-yoe/conf/projects/qemuarm64
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemuarm64
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemumips b/sources/meta-yoe/conf/projects/qemumips
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemumips
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemumips64 b/sources/meta-yoe/conf/projects/qemumips64
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemumips64
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemuppc b/sources/meta-yoe/conf/projects/qemuppc
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemuppc
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemuppc64 b/sources/meta-yoe/conf/projects/qemuppc64
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemuppc64
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemuriscv32 b/sources/meta-yoe/conf/projects/qemuriscv32
deleted file mode 120000
index 14d63fd96..000000000
--- a/sources/meta-yoe/conf/projects/qemuriscv32
+++ /dev/null
@@ -1 +0,0 @@
-qemuriscv64
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemuriscv64/config.conf b/sources/meta-yoe/conf/projects/qemuriscv64/config.conf
deleted file mode 100644
index 2097b4c58..000000000
--- a/sources/meta-yoe/conf/projects/qemuriscv64/config.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-DISTRO = "yoe"
-# "yoe-<libc>-<init-system>-<windowing-system>"
-YOE_PROFILE = "yoe-glibc-systemd-wayland"
-# usually not changed often
-# Add 4G space to QEMU image
-#IMAGE_ROOTFS_EXTRA_SPACE:append = " + 4000000"
-# common
-#TEST_SERVER_IP = "10.0.0.13"
-# QEMU
-#TEST_TARGET_IP = "192.168.7.2"
-#TEST_QEMUBOOT_TIMEOUT = "100"
-#TEST_TARGET = "qemu"
-#TEST_TARGET = "simpleremote"
-#TFTP_SERVER_IP = "10.0.0.13"
-
-#INHERIT += "scan-build"
-SCAN_BUILD ?= ""
-SCAN_BUILD:pn-openssl = "1"
-
-IMAGE_FSTYPES:append = " wic.xz wic.bmap tar.xz"
-IMAGE_FSTYPES:remove = "tar.bz2 tar.xz tar tar.gz wic.xz wic.bmap"
-# use kvm with x86/x86_64 qemu
-QEMU_USE_KVM = "1"
-# Launch vnc backend during testing
-# TEST_RUNQEMUPARAMS = "publicvnc"
-# needed for running ptests automatically
-PACKAGE_FEED_URIS ?= ""
-
-IMG_VERSION = "0.0.1"
-#####################################################################
-# add project specific configuration below this line
-#####################################################################
-#require conf/distro/include/lto.inc
-#DISTRO_FEATURES:append = " lto"
-# set max loadavg equal to nr of cpus, same at 1.0 on 1 cpu machine
-#PARALLEL_MAKE:append = " \
-#-l ${@int(os.sysconf(os.sysconf_names['SC_NPROCESSORS_ONLN'])) * 150/100} \
-#"
-
-# Setting a user/password in system
-#INHERIT += "extrausers"
-#EXTRA_USERS_PARAMS += "\
-#    useradd admin; \
-#    usermod -p '$(openssl passwd -6 myrootpassword)' admin; \
-#    usermod -a -G adm admin; \
-#    usermod -a -G video admin; \
-#    usermod -a -G audio admin; \
-#    usermod -a -G systemd-journal admin; \
-#"
-#EXTRA_IMAGE_FEATURES:remove = "debug-tweaks"
-
-# For running oe-selftest uncomment below lines
-#USER_CLASSES:remove = "buildhistory"
-#PRSERV_HOST = ""
diff --git a/sources/meta-yoe/conf/projects/qemux86 b/sources/meta-yoe/conf/projects/qemux86
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemux86
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file
diff --git a/sources/meta-yoe/conf/projects/qemux86-64 b/sources/meta-yoe/conf/projects/qemux86-64
deleted file mode 120000
index 7e3009df6..000000000
--- a/sources/meta-yoe/conf/projects/qemux86-64
+++ /dev/null
@@ -1 +0,0 @@
-qemucommon
\ No newline at end of file