From d899e499ac5a8fdeb6cfe6690ea72e4278e53f67 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Wed, 1 Apr 2026 19:24:03 +0800 Subject: [PATCH] kernel: 6.18: disable CONFIG_GENERIC_BUILTIN_DTB This symbol is selected by CONFIG_BUILTIN_DTB. However, we didn't enable it in generic config-6.18. Signed-off-by: Shiji Yang Link: https://github.com/openwrt/openwrt/pull/22730 Signed-off-by: Hauke Mehrtens --- target/linux/generic/config-6.18 | 3 +-- target/linux/malta/config-6.18 | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/config-6.18 b/target/linux/generic/config-6.18 index 0fdcaf32db..8ffb985c6a 100644 --- a/target/linux/generic/config-6.18 +++ b/target/linux/generic/config-6.18 @@ -850,7 +850,6 @@ CONFIG_BUG=y # CONFIG_BUG_ON_DATA_CORRUPTION is not set CONFIG_BUILDTIME_TABLE_SORT=y CONFIG_BUILD_SALT="" -CONFIG_BUILTIN_DTB_NAME="" # CONFIG_C2PORT is not set # CONFIG_CACHESTAT_SYSCALL is not set CONFIG_CACHE_L2X0_PMU=y @@ -2261,7 +2260,7 @@ CONFIG_GCC_NO_STRINGOP_OVERFLOW=y # CONFIG_GEMINI_ETHERNET is not set # CONFIG_GENERIC_ADC_BATTERY is not set # CONFIG_GENERIC_ADC_THERMAL is not set -CONFIG_GENERIC_BUILTIN_DTB=y +# CONFIG_GENERIC_BUILTIN_DTB is not set CONFIG_GENERIC_CALIBRATE_DELAY=y # CONFIG_GENERIC_CPU_DEVICES is not set CONFIG_GENERIC_HWEIGHT=y diff --git a/target/linux/malta/config-6.18 b/target/linux/malta/config-6.18 index 4598512cd5..1b0252cd43 100644 --- a/target/linux/malta/config-6.18 +++ b/target/linux/malta/config-6.18 @@ -21,6 +21,7 @@ CONFIG_BOARD_SCACHE=y CONFIG_BOOT_ELF32=y CONFIG_BUFFER_HEAD=y CONFIG_BUILTIN_DTB=y +CONFIG_BUILTIN_DTB_NAME="" CONFIG_CEVT_R4K=y CONFIG_CLKBLD_I8253=y CONFIG_CLKEVT_I8253=y @@ -82,6 +83,7 @@ CONFIG_FUNCTION_ALIGNMENT=0 CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_FW_LOADER_SYSFS=y CONFIG_GENERIC_ATOMIC64=y +CONFIG_GENERIC_BUILTIN_DTB=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y