diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
new file mode 100644
index 00000000..a5de2e24
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
@@ -0,0 +1 @@
+use-kernel-config=bb.org_defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
index 19664ba8..e134fb84 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
@@ -7,6 +7,7 @@ COMPATIBLE_MACHINE = "beagle.*"
 
 inherit kernel
 
+require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/ti-kernel.inc
 
 DEPENDS += "gmp-native libmpc-native"
@@ -25,13 +26,9 @@ SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
 PV:aarch64 = "5.10.162+git${SRCPV}"
 BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
 
-SRC_URI = "git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH}"
+SRC_URI = " \
+    git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
+    file://defconfig \
+"
 
 SRC_URI:append:armv7a = " file://0001-defconfig-switch-default-kernel-compression-to-LZMA.patch"
-
-DEFCONFIG_NAME = "bb.org_defconfig"
-KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
-
-kernel_do_compile:append() {
-	oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
-}