linux-baikal: Make bitbake use in-tree defcongig

diff --git a/meta-baikal/conf/machine/bfk3.conf b/meta-baikal/conf/machine/bfk3.conf
index ef631ef61ac643023c0919229a0768d9b95881ab..34879cf8738c3dabcbeec584314a941c835794a0 100644 (file)
--- a/meta-baikal/conf/machine/bfk3.conf
+++ b/meta-baikal/conf/machine/bfk3.conf
@@ -7,7 +7,7 @@ require conf/machine/include/baikal-t1.inc
 # Kernel and bootloader default configs
 UBOOT_MACHINE = "baikal_bfk3_defconfig"
 
-KBUILD_DEFCONFIG = "baikal_bfk3_defconfig"
+KBUILD_DEFCONFIG = "bfk3_defconfig"
 KERNEL_DEVICETREE = "baikal-t1/bfk3.dtb"
 PREFERRED_PROVIDER_virtual/kernel = "linux-baikal"
 PREFERRED_VERSION_virtual/kernel = "5.15%"

diff --git a/meta-baikal/recipes-kernel/linux/linux-baikal.inc b/meta-baikal/recipes-kernel/linux/linux-baikal.inc
index 723c0d224dc85fe9aca20090d3a45276b959c443..00ab3d47668715a1e4d10d432dec1b4428dc9fb8 100644 (file)
--- a/meta-baikal/recipes-kernel/linux/linux-baikal.inc
+++ b/meta-baikal/recipes-kernel/linux/linux-baikal.inc
@@ -4,6 +4,7 @@ LICENSE = "GPL-2.0-only"
 HOMEPAGE = "https://www.baikalelectronics.ru/"
 
 inherit kernel
+inherit kernel-yocto
 
 # Skip processing of this recipe if it is not explicitly specified as the
 # PREFERRED_PROVIDER for virtual/kernel. This avoids network access required
@@ -26,6 +27,9 @@ KERNEL_LD:append:mipsel = " ${TOOLCHAIN_OPTIONS}"
 
 LINUX_VERSION_EXTENSION ??= "-oebaikal-${LINUX_KERNEL_TYPE}"
 
+KCONFIG_MODE = "--alldefconfig"
+
+KERNEL_VERSION_SANITY_SKIP = "1"
 
 B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"