From 526d1b5ad5a5db3ab79ce894c37d3451841e2f00 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Wed, 6 Dec 2023 16:15:16 +1030 Subject: linux-aspeed: Prepare for CONFIG_EMBEDDED going away The aspeed configs have EMBEDDED=y, which selects EXPERT. We have a bunch of options in the config that depend on EXPERT, such as CONFIG_GPIO_SYSFS. In v6.6, EMBEDDED is replaced with EXPERT in upstream configs. This is because the only thing in the kernel that is gated by EMBEDDED is ARM_PATCH_PHYS_VIRT, which openbmc does not use. https://git.kernel.org/torvalds/c/ef815d2cba782e96b9 As they mean the same thing we can make the change to the aspeed kernel configs now. Fixes: https://github.com/openbmc/openbmc/issues/3975 Change-Id: Ia2988fd849d26b9540ffb6b064251b8b60e9dca9 Signed-off-by: Joel Stanley --- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig | 2 +- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig | 2 +- meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-aspeed/recipes-kernel') diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig index e7353ae278..c89f716c37 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g4/defconfig @@ -18,7 +18,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 48a6285794..a83fb08441 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -20,7 +20,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index 9504233228..4712baeb7f 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -20,7 +20,7 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_UID16 is not set # CONFIG_SYSFS_SYSCALL is not set # CONFIG_AIO is not set -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_PERF_EVENTS=y # CONFIG_COMPAT_BRK is not set CONFIG_SLAB_FREELIST_RANDOM=y -- cgit v1.2.3