diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-11-12 09:30:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-12 09:30:43 -0600 |
| commit | 4736d020afe9b5feca079d05f8e99a15a530d06a (patch) | |
| tree | 392f9854b4d427fbb074421e7fbc72c57b295481 /scripts | |
| parent | 1801c8df64976b26de4092245e5d89c1040b7761 (diff) | |
| parent | cd6d79866d0c53d98a308d127f98be0a11c5fa2f (diff) | |
| download | vyos-build-4736d020afe9b5feca079d05f8e99a15a530d06a.tar.gz vyos-build-4736d020afe9b5feca079d05f8e99a15a530d06a.zip | |
Merge pull request #1346 from c-po/T9580
Kernel: T9580: unify kexec/kdump and PPP options in common config fragments
Diffstat (limited to 'scripts')
3 files changed, 4 insertions, 11 deletions
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 |
