diff --git a/recipes-kernel/linux/linux-mainline-common.inc b/recipes-kernel/linux/linux-mainline-common.inc
index 45098f1..762af42 100644
--- a/recipes-kernel/linux/linux-mainline-common.inc
+++ b/recipes-kernel/linux/linux-mainline-common.inc
@@ -12,7 +12,13 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 
 KCONFIG_MODE="--alldefconfig"
 
+KBUILD_DEFCONFIG_qemuriscv32 = "rv32_defconfig"
+KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
+KBUILD_DEFCONFIG_freedom-u540 = "defconfig"
+
 COMPATIBLE_MACHINE = "(qemuriscv32|qemuriscv64|freedom-u540)"
 
+KERNEL_DEVICETREE_freedom-u540 = "sifive/${RISCV_SBI_FDT}"
+
 KERNEL_FEATURES_remove = "features/debug/printk.scc"
 KERNEL_FEATURES_remove = "features/kernel-sample/kernel-sample.scc"
diff --git a/recipes-kernel/linux/linux-mainline_5.3.bb b/recipes-kernel/linux/linux-mainline_5.3.bb
index d814202..3bfe941 100644
--- a/recipes-kernel/linux/linux-mainline_5.3.bb
+++ b/recipes-kernel/linux/linux-mainline_5.3.bb
@@ -19,9 +19,3 @@ SRC_URI_append_freedom-u540 = " \
     file://0006-drm-radeon-simplify-and-cleanup-setting-the-dma-mask.patch \
     file://0007-drm-amdgpu-simplify-and-cleanup-setting-the-dma-mask.patch \
 "
-
-KERNEL_DEVICETREE_freedom-u540 = "sifive/${RISCV_SBI_FDT}"
-
-KBUILD_DEFCONFIG_qemuriscv32 = "rv32_defconfig"
-KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"
-KBUILD_DEFCONFIG_freedom-u540 = "defconfig"