From cd6d79866d0c53d98a308d127f98be0a11c5fa2f Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 5 Nov 2026 22:04:15 +0000 Subject: Kernel: T9580: unify kexec/kdump and PPP options in common config fragments Kexec, kdump, PPTP and PPPoL2TP options were set in both the amd64 and arm64 defconfigs, duplicating or contradicting the shared fragments - x86 even disabled CRASH_DUMP while the debug fragment enabled it. Drop them from the per-arch defconfigs. The kexec options now live next to CRASH_DUMP in the debug fragment, PPTP and PPPoL2TP were already covered by the PPP fragment. The resulting kernel configuration is unchanged. --- scripts/package-build/linux-kernel/config/90-debug.config | 5 ++++- scripts/package-build/linux-kernel/config/arm64/vyos_defconfig | 6 ------ scripts/package-build/linux-kernel/config/x86/vyos_defconfig | 4 ---- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/config/90-debug.config b/scripts/package-build/linux-kernel/config/90-debug.config index 9eb5d016..483c78b2 100644 --- a/scripts/package-build/linux-kernel/config/90-debug.config +++ b/scripts/package-build/linux-kernel/config/90-debug.config @@ -182,8 +182,11 @@ CONFIG_IO_STRICT_DEVMEM=y # CONFIG_MEMTEST is not set # -# Kdump tool support +# Kexec and Kdump tool support # +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +CONFIG_KEXEC_SIG=y CONFIG_CRASH_DUMP=y CONFIG_DEBUG_INFO=y CONFIG_PROC_VMCORE=y diff --git a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig index a9129c0f..f84fad1c 100644 --- a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig +++ b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig @@ -286,12 +286,8 @@ CONFIG_TRACEPOINTS=y CONFIG_CRASH_RESERVE=y CONFIG_VMCORE_INFO=y CONFIG_KEXEC_CORE=y -CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -CONFIG_KEXEC_SIG=y CONFIG_KEXEC_IMAGE_VERIFY_SIG=y # CONFIG_KEXEC_HANDOVER is not set -CONFIG_CRASH_DUMP=y # CONFIG_CRASH_DM_CRYPT is not set # end of Kexec and crash features # end of General setup @@ -3043,8 +3039,6 @@ CONFIG_PPPOE=m CONFIG_PPPOE_HASH_BITS_4=y # CONFIG_PPPOE_HASH_BITS_8 is not set CONFIG_PPPOE_HASH_BITS=4 -CONFIG_PPTP=m -CONFIG_PPPOL2TP=m CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m # CONFIG_SLIP is not set diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig index f30f87d7..f60f63f7 100644 --- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig +++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig @@ -257,10 +257,6 @@ CONFIG_TRACEPOINTS=y # Kexec and crash features # CONFIG_KEXEC_CORE=y -CONFIG_KEXEC=y -CONFIG_KEXEC_FILE=y -CONFIG_KEXEC_SIG=y -# CONFIG_CRASH_DUMP is not set # end of Kexec and crash features # end of General setup -- cgit v1.2.3