From b9e9d6942e650ecda581c842c496d778cc02ce92 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 11 Apr 2019 09:31:57 -0700 Subject: [PATCH] linux-mainline: Use the new 32-bit defconfig in Linux 5.1 Signed-off-by: Alistair Francis --- recipes-kernel/linux/linux-mainline_5.1.bb | 4 +++- recipes-kernel/linux/linux-riscv-common.inc | 2 -- recipes-kernel/linux/linux-riscv_5.0.bb | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-mainline_5.1.bb b/recipes-kernel/linux/linux-mainline_5.1.bb index ea049a9..07219ed 100644 --- a/recipes-kernel/linux/linux-mainline_5.1.bb +++ b/recipes-kernel/linux/linux-mainline_5.1.bb @@ -29,9 +29,11 @@ SRC_URI_append_freedom-u540 = " \ # qemu uses in-tree defconfig # freedom-u540 uses out-of-tree defconfig SRC_URI_append_freedom-u540 = " file://defconfig" -SRC_URI_append_qemuriscv32 = " file://32bit.cfg" # Fix a breakage with the current 32bit glibc fork SRC_URI_append_qemuriscv32 = " file://0001-Revert-riscv-Use-latest-system-call-ABI.patch" +KBUILD_DEFCONFIG_qemuriscv32 = "rv32_defconfig" +KBUILD_DEFCONFIG_qemuriscv64 = "defconfig" + KERNEL_VERSION_SANITY_SKIP = "1" diff --git a/recipes-kernel/linux/linux-riscv-common.inc b/recipes-kernel/linux/linux-riscv-common.inc index 4501257..a9f4684 100644 --- a/recipes-kernel/linux/linux-riscv-common.inc +++ b/recipes-kernel/linux/linux-riscv-common.inc @@ -12,8 +12,6 @@ PV = "${LINUX_VERSION}+git${SRCPV}" DEPENDS_append = " libgcc" -KBUILD_DEFCONFIG_qemuriscv32 = "defconfig" -KBUILD_DEFCONFIG_qemuriscv64 = "defconfig" KCONFIG_MODE="--alldefconfig" KERNEL_CC_append = " ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS}" diff --git a/recipes-kernel/linux/linux-riscv_5.0.bb b/recipes-kernel/linux/linux-riscv_5.0.bb index e5ae674..0832f92 100644 --- a/recipes-kernel/linux/linux-riscv_5.0.bb +++ b/recipes-kernel/linux/linux-riscv_5.0.bb @@ -12,5 +12,7 @@ SRC_URI = " \ # qemu uses in-tree defconfig # freedom-u540 uses out-of-tree defconfig SRC_URI_append_freedom-u540 = " file://defconfig" - SRC_URI_append_qemuriscv32 = " file://32bit.cfg" + +KBUILD_DEFCONFIG_qemuriscv32 = "defconfig" +KBUILD_DEFCONFIG_qemuriscv64 = "defconfig"