From 8da7bd8241b4164443dbbdae04173c43b4dc5924 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Sat, 16 Dec 2017 18:13:06 -0300 Subject: [PATCH] sys-kernel: cleanup options Move options explicitly enabled in arm64 and that x86 enable by default to the common config file. Changes on x86: * CONFIG_HW_RANDOM was compiled as a module, and now it is built-in. Changes on ARM64: * CONFIG_KEXEC is enabled. Signed-off-by: Ezequiel Garcia --- .../coreos-modules/files/amd64_defconfig-4.14 | 1 - .../coreos-modules/files/amd64_defconfig-4.15 | 1 - .../coreos-modules/files/arm64_defconfig-4.14 | 8 -------- .../coreos-modules/files/arm64_defconfig-4.15 | 8 -------- .../sys-kernel/coreos-modules/files/commonconfig-4.14 | 10 +++++++++- .../sys-kernel/coreos-modules/files/commonconfig-4.15 | 10 +++++++++- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.14 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.14 index 087a705d61..3c9bdda0df 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.14 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.14 @@ -21,7 +21,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 -CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_KEXEC_VERIFY_SIG=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.15 index 087a705d61..3c9bdda0df 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.15 @@ -21,7 +21,6 @@ CONFIG_MEM_SOFT_DIRTY=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 -CONFIG_KEXEC=y CONFIG_KEXEC_FILE=y CONFIG_KEXEC_VERIFY_SIG=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 index ba0aec1e5d..ee2bbef9f4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.14 @@ -2,7 +2,6 @@ CONFIG_NO_HZ_IDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y # CONFIG_PROC_PID_CPUSET is not set -CONFIG_KALLSYMS_ALL=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_QCOM=y @@ -13,11 +12,8 @@ CONFIG_ARCH_THUNDER=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_STUB=m -CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_HOST_GENERIC=y @@ -58,7 +54,6 @@ CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_HW_RANDOM=y CONFIG_TCG_TIS_ST33ZP24=m CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m @@ -94,8 +89,6 @@ CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_PHY_XGENE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_DEBUG_FS=y -CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_ARM64_CRYPTO=y @@ -105,5 +98,4 @@ CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y -CONFIG_ACPI=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.15 index ba0aec1e5d..ee2bbef9f4 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.15 @@ -2,7 +2,6 @@ CONFIG_NO_HZ_IDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y # CONFIG_PROC_PID_CPUSET is not set -CONFIG_KALLSYMS_ALL=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_MEDIATEK=y CONFIG_ARCH_QCOM=y @@ -13,11 +12,8 @@ CONFIG_ARCH_THUNDER=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y CONFIG_PCI_REALLOC_ENABLE_AUTO=y CONFIG_PCI_STUB=m -CONFIG_PCI_IOV=y CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_HOST_GENERIC=y @@ -58,7 +54,6 @@ CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_HW_RANDOM=y CONFIG_TCG_TIS_ST33ZP24=m CONFIG_TCG_TIS_ST33ZP24_I2C=m CONFIG_TCG_TIS_ST33ZP24_SPI=m @@ -94,8 +89,6 @@ CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_PHY_XGENE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=y -CONFIG_DEBUG_FS=y -CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_CRYPTO_ANSI_CPRNG=y CONFIG_ARM64_CRYPTO=y @@ -105,5 +98,4 @@ CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y -CONFIG_ACPI=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.14 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.14 index 1ce3e6b9a0..006e10a06c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.14 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.14 @@ -34,6 +34,7 @@ CONFIG_USER_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y +CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y @@ -56,6 +57,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIE_ECRC=y CONFIG_HOTPLUG_PCI=y +CONFIG_NR_CPUS=512 CONFIG_SCHED_SMT=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=7 @@ -74,12 +76,17 @@ CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_EFIVAR_FS=y CONFIG_BINFMT_MISC=m +CONFIG_KEXEC=y +CONFIG_ACPI=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_IOV=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m @@ -714,6 +721,7 @@ CONFIG_IPMI_SI=m CONFIG_IPMI_SSIF=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_RAW_DRIVER=m @@ -932,4 +940,4 @@ CONFIG_MODULE_SIG_KEY="certs/modules.pem" # CONFIG_XZ_DEC_ARM is not set # CONFIG_XZ_DEC_ARMTHUMB is not set # CONFIG_XZ_DEC_SPARC is not set -CONFIG_NR_CPUS=512 +CONFIG_DEBUG_FS=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.15 index 1ce3e6b9a0..006e10a06c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.15 @@ -34,6 +34,7 @@ CONFIG_USER_NS=y CONFIG_SCHED_AUTOGROUP=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y +CONFIG_KALLSYMS_ALL=y CONFIG_BPF_SYSCALL=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y @@ -56,6 +57,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y CONFIG_PCIE_ECRC=y CONFIG_HOTPLUG_PCI=y +CONFIG_NR_CPUS=512 CONFIG_SCHED_SMT=y CONFIG_NUMA=y CONFIG_NODES_SHIFT=7 @@ -74,12 +76,17 @@ CONFIG_EFI_STUB=y CONFIG_EFI=y CONFIG_EFIVAR_FS=y CONFIG_BINFMT_MISC=m +CONFIG_KEXEC=y +CONFIG_ACPI=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_IOV=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_DIAG=m @@ -714,6 +721,7 @@ CONFIG_IPMI_SI=m CONFIG_IPMI_SSIF=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m +CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_RAW_DRIVER=m @@ -932,4 +940,4 @@ CONFIG_MODULE_SIG_KEY="certs/modules.pem" # CONFIG_XZ_DEC_ARM is not set # CONFIG_XZ_DEC_ARMTHUMB is not set # CONFIG_XZ_DEC_SPARC is not set -CONFIG_NR_CPUS=512 +CONFIG_DEBUG_FS=y