diff --git a/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend b/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
index cb387920..5bc2c2a7 100644
--- a/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
+++ b/external/openembedded-layer/recipes-multimedia/v4l2apps/v4l-utils_%.bbappend
@@ -1,4 +1,3 @@
 TEGRA_PLUGINS ?= ""
 TEGRA_PLUGINS_tegra = "tegra-libraries-libv4l-plugins"
-TEGRA_PLUGINS_tegra124 = ""
 RRECOMMENDS_libv4l += "${TEGRA_PLUGINS}"
diff --git a/external/openembedded-layer/recipes-support/opencv/opencv_4.1.0.bbappend b/external/openembedded-layer/recipes-support/opencv/opencv_4.1.0.bbappend
index 54aaf9ca..cbab0e54 100644
--- a/external/openembedded-layer/recipes-support/opencv/opencv_4.1.0.bbappend
+++ b/external/openembedded-layer/recipes-support/opencv/opencv_4.1.0.bbappend
@@ -3,15 +3,4 @@ inherit cuda
 EXTRA_OECMAKE_append_tegra210 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="5.3" -DCUDA_ARCH_PTX=""'
 EXTRA_OECMAKE_append_tegra186 = ' -DWITH_CUDA=ON -DCUDA_ARCH_BIN="6.2" -DCUDA_ARCH_PTX=""'
 
-# See here (https://docs.opencv.org/trunk/d6/d15/tutorial_building_tegra_cuda.html) 
-# for the recommended flags.
-# Standard opencv_3.3 recipe from meta-oe does not include OpenMP, so I'm adding it here.
-EXTRA_OECMAKE_append_tegra124 = '       \
-    -DWITH_CUDA=ON                      \
-    -DCUDA_ARCH_BIN="3.2"               \
-    -DCUDA_ARCH_PTX=""                  \
-    -DENABLE_NEON=ON                    \
-    -DWITH_OPENMP=ON                    \
-  '
-
 EXTRA_OECMAKE_append = " -DOPENCV_GENERATE_PKGCONFIG=ON"
diff --git a/recipes-bsp/tegra-binaries/tegra-binaries-32.2.1.inc b/recipes-bsp/tegra-binaries/tegra-binaries-32.2.1.inc
index 0c244f56..72e68ff6 100644
--- a/recipes-bsp/tegra-binaries/tegra-binaries-32.2.1.inc
+++ b/recipes-bsp/tegra-binaries/tegra-binaries-32.2.1.inc
@@ -41,4 +41,3 @@ INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 COMPATIBLE_MACHINE = "tegra"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
diff --git a/recipes-bsp/tegra-binaries/tegra-bootfiles_32.2.1.bb b/recipes-bsp/tegra-binaries/tegra-bootfiles_32.2.1.bb
index 9ebfcdd9..9361183d 100644
--- a/recipes-bsp/tegra-binaries/tegra-bootfiles_32.2.1.bb
+++ b/recipes-bsp/tegra-binaries/tegra-bootfiles_32.2.1.bb
@@ -2,7 +2,6 @@ require tegra-binaries-${PV}.inc
 require tegra-shared-binaries.inc
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "${SOC_FAMILY}-flashtools-native dtc-native sdcard-layout"
 DEPENDS_append_tegra186 = " tegra-flashvars"
diff --git a/recipes-bsp/tegra-binaries/tegra-nvphs_32.2.1.bb b/recipes-bsp/tegra-binaries/tegra-nvphs_32.2.1.bb
index 9edfe5f2..d5e0a6fd 100644
--- a/recipes-bsp/tegra-binaries/tegra-nvphs_32.2.1.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvphs_32.2.1.bb
@@ -4,7 +4,6 @@ require tegra-shared-binaries.inc
 DESCRIPTION = "NVIDIA Power Hinting Service"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 NVPHSD_MACHINE_CONF = "nvphsd.conf"
 NVPHSD_MACHINE_CONF_tegra186 = "nvphsd.conf.t186"
 NVPHSD_MACHINE_CONF_tegra194 = "nvphsd.conf.t194"
diff --git a/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.2.1.bb b/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.2.1.bb
index faef6c66..f0f28ad1 100644
--- a/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.2.1.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvpmodel_32.2.1.bb
@@ -4,7 +4,6 @@ require tegra-shared-binaries.inc
 DESCRIPTION = "nvpmodel tool and configuration files"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_configure() {
     tar -C ${B} -x -f ${S}/nv_tegra/nv_tools.tbz2
diff --git a/recipes-bsp/tegra-binaries/tegra-nvs-service_32.2.1.bb b/recipes-bsp/tegra-binaries/tegra-nvs-service_32.2.1.bb
index dfc2144d..9fcc7055 100644
--- a/recipes-bsp/tegra-binaries/tegra-nvs-service_32.2.1.bb
+++ b/recipes-bsp/tegra-binaries/tegra-nvs-service_32.2.1.bb
@@ -4,7 +4,6 @@ require tegra-shared-binaries.inc
 DESCRIPTION = "NVIDIA sensor HAL daemon"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_configure() {
     tar -C ${B} -x -f ${S}/nv_tegra/nvidia_drivers.tbz2 usr/sbin/nvs-service
diff --git a/recipes-bsp/tegra-sources/tegra-sources-32.2.1.inc b/recipes-bsp/tegra-sources/tegra-sources-32.2.1.inc
index ce5231a9..2f3f4649 100644
--- a/recipes-bsp/tegra-sources/tegra-sources-32.2.1.inc
+++ b/recipes-bsp/tegra-sources/tegra-sources-32.2.1.inc
@@ -30,5 +30,4 @@ python do_unpack() {
 }
 
 COMPATIBLE_MACHINE = "tegra"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
diff --git a/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bb b/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bb
index e50973a7..ec9b506f 100644
--- a/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bb
+++ b/recipes-devtools/cuda/cuda-binaries_10.0.326-1.bb
@@ -14,5 +14,4 @@ SRC_URI[sha256sum] = "3a8bcbd19b102fc4daae6ea00648eae5e65c48e8656e93008072abd373
 do_unpack[depends] += "xz-native:do_populate_sysroot"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
diff --git a/recipes-devtools/cuda/cuda-samples_10.0.326-1.bb b/recipes-devtools/cuda/cuda-samples_10.0.326-1.bb
index b0eb197d..77353dd2 100644
--- a/recipes-devtools/cuda/cuda-samples_10.0.326-1.bb
+++ b/recipes-devtools/cuda/cuda-samples_10.0.326-1.bb
@@ -4,7 +4,6 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://EULA.txt;md5=049f8f2a31b8c3cc436cc63f0a72c9c9"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_fetch[noexec] = "1"
 do_unpack[depends] += "${MLPREFIX}cuda-binaries:do_preconfigure dpkg-native:do_populate_sysroot"
diff --git a/recipes-devtools/cuda/cuda-shared-binaries-10.0.326-1.inc b/recipes-devtools/cuda/cuda-shared-binaries-10.0.326-1.inc
index 0764d77f..1b090640 100644
--- a/recipes-devtools/cuda/cuda-shared-binaries-10.0.326-1.inc
+++ b/recipes-devtools/cuda/cuda-shared-binaries-10.0.326-1.inc
@@ -97,5 +97,4 @@ sysroot_stage_dirs_append() {
 }
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
diff --git a/recipes-devtools/cuda/cuda-toolkit_10.0.326-1.bb b/recipes-devtools/cuda/cuda-toolkit_10.0.326-1.bb
index eb68dad6..dfd05b4c 100644
--- a/recipes-devtools/cuda/cuda-toolkit_10.0.326-1.bb
+++ b/recipes-devtools/cuda/cuda-toolkit_10.0.326-1.bb
@@ -23,7 +23,6 @@ do_compile[noexec] = "1"
 do_install[noexec] = "1"
 
 COMPATIBLE_MACHINE = "tegra"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
 
 PACKAGES = "${PN}"
diff --git a/recipes-devtools/cudnn/cudnn_7.5.0.56-1.bb b/recipes-devtools/cudnn/cudnn_7.5.0.56-1.bb
index b10236b4..0902b4bb 100644
--- a/recipes-devtools/cudnn/cudnn_7.5.0.56-1.bb
+++ b/recipes-devtools/cudnn/cudnn_7.5.0.56-1.bb
@@ -16,7 +16,6 @@ SRC_URI[dev.sha256sum] = "dc3f17b3d3a3db983389784b0902d32651f0b7d1b35a903385d2cc
 SRC_URI[doc.md5sum] = "f9e43d15ff69d65a85d2aade71a43870"
 SRC_URI[doc.sha256sum] = "5df29804608ddc34d90d116e99b752bd3a2fb569c4c3fa36964018b5ae0b18f8"
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
 
 def extract_basever(d):
diff --git a/recipes-devtools/gie/tensorrt_5.1.6-1.bb b/recipes-devtools/gie/tensorrt_5.1.6-1.bb
index b252b1fc..5fe320ed 100644
--- a/recipes-devtools/gie/tensorrt_5.1.6-1.bb
+++ b/recipes-devtools/gie/tensorrt_5.1.6-1.bb
@@ -35,7 +35,6 @@ SRC_URI[samples.md5sum] = "${SAMPMD5SUM}"
 SRC_URI[samples.sha256sum] = "${SAMPSHA256SUM}"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 LIC_FILES_CHKSUM = "file://usr/include/aarch64-linux-gnu/NvInfer.h;endline=48;md5=1755df325a6e1ac8515b1e469efe07a7"
 
diff --git a/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.bb b/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.bb
index cf6c500a..bbd3301b 100644
--- a/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.bb
+++ b/recipes-devtools/visionworks/libvisionworks-sfm_0.90.4.bb
@@ -18,7 +18,6 @@ CUDAPATH ?= "/usr/local/cuda-${CUDA_VERSION}"
 DEPENDS = "dpkg-native cuda-cudart patchelf-native libvisionworks"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_compile() {
     dpkg-deb --extract ${S}/var/visionworks-sfm-repo/libvisionworks-sfm_${PV}_arm64.deb ${B}
diff --git a/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.bb b/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.bb
index b521b7ca..679894df 100644
--- a/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.bb
+++ b/recipes-devtools/visionworks/libvisionworks-tracking_0.88.2.bb
@@ -16,7 +16,6 @@ CUDAPATH ?= "/usr/local/cuda-${CUDA_VERSION}"
 DEPENDS = "dpkg-native cuda-cudart patchelf-native libvisionworks"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_compile() {
     dpkg-deb --extract ${S}/var/visionworks-tracking-repo/libvisionworks-tracking_${PV}_arm64.deb ${B}
diff --git a/recipes-devtools/visionworks/libvisionworks_1.6.0.500n.bb b/recipes-devtools/visionworks/libvisionworks_1.6.0.500n.bb
index b4158874..1c9998c0 100644
--- a/recipes-devtools/visionworks/libvisionworks_1.6.0.500n.bb
+++ b/recipes-devtools/visionworks/libvisionworks_1.6.0.500n.bb
@@ -16,7 +16,6 @@ CUDAPATH ?= "/usr/local/cuda-${CUDA_VERSION}"
 DEPENDS = "dpkg-native cuda-cudart patchelf-native"
 
 COMPATIBLE_MACHINE = "tegra"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 do_compile() {
     dpkg-deb --extract ${S}/var/visionworks-repo/libvisionworks_${PV}_arm64.deb ${B}
diff --git a/recipes-graphics/libglvnd/libglvnd_1.1.1.bb b/recipes-graphics/libglvnd/libglvnd_1.1.1.bb
index 274ab562..9dd376a8 100644
--- a/recipes-graphics/libglvnd/libglvnd_1.1.1.bb
+++ b/recipes-graphics/libglvnd/libglvnd_1.1.1.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/NVIDIA/libglvnd \
 SRCREV = "bc9990b7bede44899627354d0c356f48950f4ad1"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 REQUIRED_DISTRO_FEATURES = "opengl"
 
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index f5cbd02e..cabc2148 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -2,19 +2,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 GLHDRS_PATCH = ""
 GLHDRS_PATCH_tegra = "file://egl-gles2-nv-extensions.patch"
-GLHDRS_PATCH_tegra124 = ""
 SRC_URI += "${GLHDRS_PATCH}"
 
 TEGRADEPS = ""
 TEGRADEPS_tegra = "tegra-mmapi-glheaders tegra-libraries"
-TEGRADEPS_tegra124 = "tegra-libraries"
 DEPENDS += "${TEGRADEPS}"
 
 PACKAGECONFIG[glvnd] = "-Dglvnd=true,-Dglvnd=false,libglvnd"
 
 GLVNDCFG = ""
 GLVNDCFG_tegra = " glvnd"
-GLVNDCFG_tegra124 = ""
 PACKAGECONFIG_append_class-target = "${GLVNDCFG}"
 PACKAGECONFIG_remove_class-target_tegra = "glx-tls"
 EXTRA_OEMESON_append_tegra = " -Ddri-drivers='' -Ddri3=false"
diff --git a/recipes-kernel/linux/kernel-devsrc.bbappend b/recipes-kernel/linux/kernel-devsrc.bbappend
index 402ac9c2..30d264ab 100644
--- a/recipes-kernel/linux/kernel-devsrc.bbappend
+++ b/recipes-kernel/linux/kernel-devsrc.bbappend
@@ -1,18 +1,5 @@
 KERNEL_AWKSCRIPTDIRS ?= "scripts tools arch/*/tools"
 
-do_install_prepend_tegra124() {
-    touch ${S}/Build
-    if [ ! -e ${S}/arch/arm/kernel/module.lds ]; then
-        touch ${S}/arch/arm/kernel/module.lds
-	remove_module_lds=yes
-    fi
-    if [ ! -d ${S}/arch/x86/entry ]; then
-        mkdir -p ${S}/arch/x86/entry/syscalls
-	touch ${S}/arch/x86/entry/syscalls/syscall_32.tbl
-	remove_arch_x86_entry=yes
-    fi
-}
-
 do_install_append() {
     (
 	cd $kerneldir/build
@@ -21,13 +8,3 @@ do_install_append() {
 	done
     )
 }
-
-do_install_append_tegra124() {
-    rm -f ${S}/Build $kerneldir/build/Build
-    if [ "$remove_module_lds" = "yes" ]; then
-        rm -f ${S}/arch/arm/kernel/module.lds $kerneldir/build/arch/arm/kernel/module.lds
-    fi
-    if [ "$remove_arch_x86_entry" = "yes" ]; then
-        rm -rf ${S}/arch/x86/entry kerneldir/build/arch/x86/entry
-    fi
-}
diff --git a/recipes-kernel/linux/linux-tegra_4.9.bb b/recipes-kernel/linux/linux-tegra_4.9.bb
index 0c54678c..e24aac9f 100644
--- a/recipes-kernel/linux/linux-tegra_4.9.bb
+++ b/recipes-kernel/linux/linux-tegra_4.9.bb
@@ -33,6 +33,5 @@ do_configure_prepend() {
 }
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${@'' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else '${KERNEL_PACKAGE_NAME}-image'}"
diff --git a/recipes-multimedia/argus/tegra-mmapi-32.2.1.inc b/recipes-multimedia/argus/tegra-mmapi-32.2.1.inc
index 0bafb5cc..89cf5551 100644
--- a/recipes-multimedia/argus/tegra-mmapi-32.2.1.inc
+++ b/recipes-multimedia/argus/tegra-mmapi-32.2.1.inc
@@ -18,7 +18,6 @@ S = "${WORKDIR}/tegra_multimedia_api"
 B = "${S}"
 
 COMPATIBLE_MACHINE = "(tegra)"
-COMPATIBLE_MACHINE_tegra124 = "(-)"
 
 PACKAGE_ARCH = "${SOC_FAMILY_PKGARCH}"
 
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
deleted file mode 100644
index e8c3b89a..00000000
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_OECONF_append_tegra124 = " --disable-memfd"
-
-do_install_append_tegra124() {
-    rm ${D}${sysconfdir}/pulse/default.pa
-}
-
-RCONFDEPS = ""
-RCONFDEPS_tegra124 = "tegra-configs-pulseaudio"
-RDEPENDS_pulseaudio-server += "${RCONFDEPS}"
-
-PACKAGE_ARCH_tegra124 = "${SOC_FAMILY_PKGARCH}"