move options specific to single arch to respective configs

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 95d3f10d16c6b12032ce47ae04e9df48b9376dd7..e5cdb85f47a700b1b79b8736774f62b99dc38535 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2,15 +2,12 @@
 #-
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
-ACRN_GUEST all=y
-ARCH_CPUIDLE_HALTPOLL all=y
 ARCH_MEMORY_PROBE all=n
 ARM64_RELOC_TEST arm64=m
 ARM_KPROBES_TEST arm=m
 ARM_PTDUMP_DEBUGFS arm=n
 COMPAT_32BIT_TIME all=y
 CPA_DEBUG all=n
-DEBUG_ALIGN_RODATA arm64=n
 DEBUG_BOOT_PARAMS all=y
 DEBUG_EFI arm64=n
 DEBUG_ENTRY all=n
@@ -21,38 +18,25 @@ DEBUG_TLBFLUSH all=n
 DEBUG_USER arm=n
 EARLY_PRINTK_DBGP all=n
 EARLY_PRINTK_USB_XDBC all=n
-EFI_MIXED all=y
 EFI_PGT_DUMP all=n
-GEN_RTC all=n
 HAVE_STACK_VALIDATION all=y
 IOMMU_DEBUG all=n
-IOSF_MBI all=y
-IOSF_MBI_DEBUG all=y
 IO_DELAY_0X80 all=y
 IO_DELAY_0XED all=n
 IO_DELAY_NONE all=n
 IO_DELAY_UDELAY all=n
-JAILHOUSE_GUEST all=y
 JUMP_LABEL all=y
 KEXEC_FILE all=y
 KEXEC_SIG all=n
 KPROBES arm=y arm64=y
 LOCK_EVENT_COUNTS all=n
 LTO_NONE all=y
-PAGE_TABLE_ISOLATION all=y
-PERF_EVENTS_AMD_POWER all=m
-PERF_EVENTS_AMD_UNCORE all=m
-PERF_EVENTS_INTEL_CSTATE all=m
-PERF_EVENTS_INTEL_RAPL all=m
-PERF_EVENTS_INTEL_UNCORE all=m
 PID_IN_CONTEXTIDR arm=n arm64=n
 PUNIT_ATOM_DEBUG all=m
 RANDOMIZE_KSTACK_OFFSET_DEFAULT all=y
-RANDOMIZE_MEMORY all=y
 RAS_CEC all=y
 RAS_CEC_DEBUG all=n
 SCHED_CLUSTER all=y
-SCHED_MC_PRIO all=y
 SECCOMP all=y
 SECCOMP_CACHE_DEBUG all=n
 SHADOW_CALL_STACK arm64=y
@@ -62,26 +46,14 @@ STATIC_CALL_SELFTEST all=n
 STATIC_KEYS_SELFTEST all=y
 STRICT_KERNEL_RWX arm=y
 STRICT_MODULE_RWX arm=y
-STRICT_SIGALTSTACK_SIZE all=y
 UNWINDER_ARM arm=y
 UNWINDER_FRAME_POINTER arm=n i386=y x86_64=n
 UNWINDER_ORC x86_64=y
 VMAP_STACK all=y
-X86_AMD_PLATFORM_DEVICE all=y
-X86_CPA_STATISTICS all=y
 X86_DEBUG_FPU all=n
 X86_DECODER_SELFTEST all=n
-X86_KERNEL_IBT all=n
-X86_MCELOG_LEGACY all=y
-X86_SGX all=y
 X86_VERBOSE_BOOTUP all=n
-X86_X32_ABI all=y
-XEN_512GB all=y
 XEN_DOM0 all=y
-XEN_PV all=y
-XEN_PVH all=y
-XEN_PVHVM all=y
-XEN_PVHVM_GUEST all=y
 
 #-
 #- *** FILE: block/Kconfig ***

diff --git a/kernel-powerpc.config b/kernel-powerpc.config
index 7f0cfc36185561d793fbc1abe2fdbb0060676dc2..43d285f5f351a920be7e87bae9f02a14ca8f06f8 100644 (file)
--- a/kernel-powerpc.config
+++ b/kernel-powerpc.config
@@ -1,81 +1,29 @@
 
-#-
-#- *** FILE: arch/Kconfig ***
-#-
-OPROFILE powerpc=m
-OPROFILE_IBS powerpc=n
-KPROBES powerpc=y
-#- file kernel/gcov/Kconfig goes here
-
 #-
 #- *** FILE: arch/powerpc/Kconfig ***
 #-
 #- file arch/powerpc/platforms/Kconfig.cputype goes here
-#- file init/Kconfig goes here
-#- file kernel/Kconfig.freezer goes here
 #- file arch/powerpc/sysdev/Kconfig goes here
 #- file arch/powerpc/platforms/Kconfig goes here
 HIGHMEM ppc=n
-#- file kernel/time/Kconfig goes here
 #- file kernel/Kconfig.hz goes here
-#- file kernel/Kconfig.preempt goes here
-#- file fs/Kconfig.binfmt goes here
-IOMMU_VMERGE ppc64=n
-SWIOTLB powerpc=n
 HOTPLUG_CPU powerpc=y
 KEXEC powerpc=y
 CRASH_DUMP powerpc=n
-PHYP_DUMP ppc64=n
 IRQ_ALL_CPUS powerpc=y
 NUMA ppc64=y
-#- file mm/Kconfig goes here
 PPC_4K_PAGES ppc=y ppc64=y
 PPC_64K_PAGES ppc64=n
 FORCE_MAX_ZONEORDER ppc=11 ppc64=13
 SCHED_SMT ppc64=n
-PROC_DEVICETREE powerpc=y
-CMDLINE_BOOL powerpc=n
 EXTRA_TARGETS powerpc=""
 #- file kernel/power/Kconfig goes here
-SECCOMP powerpc=y
 ISA ppc=n
-#- file drivers/pci/pcie/Kconfig goes here
-#- file drivers/pci/Kconfig goes here
-#- file drivers/pcmcia/Kconfig goes here
-#- file drivers/pci/hotplug/Kconfig goes here
-#- file drivers/rapidio/Kconfig goes here
 ADVANCED_OPTIONS ppc=n
 #- Default settings for advanced configuration options are used
 KERNEL_START ppc=0xc0000000
-#- file net/Kconfig goes here
-#- file drivers/Kconfig goes here
-#- file fs/Kconfig goes here
-#- file arch/powerpc/sysdev/qe_lib/Kconfig goes here
-#- file lib/Kconfig goes here
-#- file arch/powerpc/Kconfig.debug goes here
-#- file security/Kconfig goes here
-#- file crypto/Kconfig goes here
 #- file arch/powerpc/kvm/Kconfig goes here
-
-#-
-#- *** FILE: arch/powerpc/Kconfig.debug ***
-#-
-#- file lib/Kconfig.debug goes here
-PPC_DISABLE_WERROR powerpc=y
-PRINT_STACK_DEPTH powerpc=64
-DEBUG_STACKOVERFLOW powerpc=n
-DEBUG_STACK_USAGE powerpc=n
-HCALL_STATS ppc64=n
-PPC_EMULATED_STATS powerpc=n
-CODE_PATCHING_SELFTEST powerpc=n
-FTR_FIXUP_SELFTEST powerpc=n
-MSI_BITMAP_SELFTEST powerpc=n
-XMON powerpc=n
-IRQSTACKS powerpc=n
-VIRQ_DEBUG powerpc=n
-BDI_SWITCH ppc=n
-BOOTX_TEXT powerpc=n
-PPC_EARLY_DEBUG powerpc=n
+#- file kernel/livepatch/Kconfig goes here
 
 #-
 #- *** FILE: arch/powerpc/kvm/Kconfig ***
@@ -83,13 +31,11 @@ PPC_EARLY_DEBUG powerpc=n
 #- file virt/kvm/Kconfig goes here
 VIRTUALIZATION powerpc=y
 KVM ppc=y
-#- file drivers/virtio/Kconfig goes here
 
 #-
 #- *** FILE: arch/powerpc/platforms/512x/Kconfig ***
 #-
 MPC5121_ADS ppc=n
-MPC5121_GENERIC ppc=n
 
 #-
 #- *** FILE: arch/powerpc/platforms/52xx/Kconfig ***
@@ -100,7 +46,6 @@ PPC_EFIKA ppc=y
 PPC_LITE5200 ppc=y
 PPC_MEDIA5200 ppc=y
 PPC_MPC5200_BUGFIX ppc=y
-PPC_MPC5200_GPIO ppc=y
 
 #-
 #- *** FILE: arch/powerpc/platforms/82xx/Kconfig ***
@@ -120,13 +65,12 @@ PPC_86xx ppc=n
 #-
 #- *** FILE: arch/powerpc/platforms/Kconfig ***
 #-
+#- file arch/powerpc/platforms/powernv/Kconfig goes here
 #- file arch/powerpc/platforms/pseries/Kconfig goes here
-#- file arch/powerpc/platforms/iseries/Kconfig goes here
 #- file arch/powerpc/platforms/chrp/Kconfig goes here
 #- file arch/powerpc/platforms/512x/Kconfig goes here
 #- file arch/powerpc/platforms/52xx/Kconfig goes here
 #- file arch/powerpc/platforms/powermac/Kconfig goes here
-#- file arch/powerpc/platforms/prep/Kconfig goes here
 #- file arch/powerpc/platforms/maple/Kconfig goes here
 #- file arch/powerpc/platforms/pasemi/Kconfig goes here
 #- file arch/powerpc/platforms/ps3/Kconfig goes here
@@ -140,21 +84,16 @@ PPC_86xx ppc=n
 #- file arch/powerpc/platforms/44x/Kconfig goes here
 #- file arch/powerpc/platforms/40x/Kconfig goes here
 #- file arch/powerpc/platforms/amigaone/Kconfig goes here
+#- file arch/powerpc/platforms/book3s/Kconfig goes here
+#- file arch/powerpc/platforms/microwatt/Kconfig goes here
 PPC_OF_BOOT_TRAMPOLINE powerpc=y
 UDBG_RTAS_CONSOLE ppc=n ppc64=y
-PPC_UDBG_BEAT ppc64=y
 RTAS_PROC powerpc=y
 RTAS_FLASH ppc64=m
-IBMEBUS ppc64=n
 #- file drivers/cpufreq/Kconfig goes here
-CPU_FREQ_PMAC ppc=y
-CPU_FREQ_PMAC64 ppc64=y
-PPC_PASEMI_CPUFREQ ppc64=y
-PPC601_SYNC_FIX ppc=y
+#- file drivers/cpuidle/Kconfig goes here
 TAU ppc=n
-AXON_RAM ppc64=m
-#- file arch/powerpc/sysdev/bestcomm/Kconfig goes here
-SIMPLE_GPIO powerpc=y
+GEN_RTC all=n
 
 #-
 #- *** FILE: arch/powerpc/platforms/Kconfig.cputype ***
@@ -165,15 +104,10 @@ PPC_85xx ppc=n
 PPC_8xx ppc=n
 40x ppc=n
 44x ppc=n
-E200 ppc=n
 PPC_BOOK3S_64 ppc64=y
 PPC_BOOK3E_64 ppc64=n
-POWER4_ONLY ppc64=n
-6xx ppc=y
-TUNE_CELL ppc64=n
 ALTIVEC powerpc=y
 VSX ppc64=y
-VIRT_CPU_ACCOUNTING ppc64=y
 SMP powerpc=y
 NR_CPUS ppc=4 ppc64=32
 
@@ -181,17 +115,11 @@ NR_CPUS ppc=4 ppc64=32
 #- *** FILE: arch/powerpc/platforms/cell/Kconfig ***
 #-
 PPC_IBM_CELL_BLADE ppc64=y
-PPC_CELLEB ppc64=y
-PPC_CELL_QPACE ppc64=y
 SPU_FS ppc64=m
-SPU_FS_64K_LS ppc64=y
 CBE_RAS ppc64=y
 PPC_IBM_CELL_RESETBUTTON ppc64=y
 PPC_IBM_CELL_POWERBUTTON ppc64=m
 CBE_THERM ppc64=m
-CBE_CPUFREQ ppc64=m
-CBE_CPUFREQ_PMI_ENABLE ppc64=y
-CBE_CPUFREQ_PMI ppc64=m
 PPC_PMI ppc64=m
 CBE_CPUFREQ_SPU_GOVERNOR ppc64=m
 
@@ -205,14 +133,6 @@ PPC_CHRP ppc=y
 #-
 EMBEDDED6xx ppc=n
 
-#-
-#- *** FILE: arch/powerpc/platforms/iseries/Kconfig ***
-#-
-PPC_ISERIES ppc64=y
-VIODASD ppc64=n
-VIOCD ppc64=n
-VIOTAPE ppc64=n
-
 #-
 #- *** FILE: arch/powerpc/platforms/maple/Kconfig ***
 #-
@@ -232,13 +152,6 @@ PPC_PASEMI_MDIO ppc64=m
 PPC_PMAC powerpc=y
 PPC_PMAC64 ppc64=y
 
-#-
-#- *** FILE: arch/powerpc/platforms/prep/Kconfig ***
-#-
-PPC_PREP ppc=y
-PREP_RESIDUAL ppc=y
-PROC_PREPRESIDUAL ppc=y
-
 #-
 #- *** FILE: arch/powerpc/platforms/ps3/Kconfig ***
 #-
@@ -257,20 +170,71 @@ PS3_LPM ppc64=m
 #-
 PPC_PSERIES ppc64=y
 PPC_SPLPAR ppc64=n
-SCANLOG ppc64=n
 PPC_SMLPAR ppc64=y
 CMM ppc64=m
+IBMEBUS ppc64=n
 
 #-
-#- *** FILE: arch/powerpc/sysdev/bestcomm/Kconfig ***
+#- *** FILE: drivers/cpufreq/Kconfig.powerpc ***
 #-
-PPC_BESTCOMM ppc=m
-PPC_BESTCOMM_ATA ppc=m
-PPC_BESTCOMM_FEC ppc=m
-PPC_BESTCOMM_GEN_BD ppc=m
+CPU_FREQ_PMAC ppc=y
+CPU_FREQ_PMAC64 ppc64=y
+PPC_PASEMI_CPUFREQ ppc64=y
 
 #-
-#- *** FILE: drivers/edac/Kconfig ***
+#- *** PROBABLY REMOVED OPTIONS ***
 #-
-#- Reporting subsystems
+6xx ppc=y
+AXON_RAM ppc64=m
+BDI_SWITCH ppc=n
+BOOTX_TEXT powerpc=n
+CBE_CPUFREQ ppc64=m
+CBE_CPUFREQ_PMI ppc64=m
+CBE_CPUFREQ_PMI_ENABLE ppc64=y
+CMDLINE_BOOL powerpc=n
+CODE_PATCHING_SELFTEST powerpc=n
+DEBUG_STACKOVERFLOW powerpc=n
+DEBUG_STACK_USAGE powerpc=n
+E200 ppc=n
 EDAC_CPC925 ppc64=m
+FTR_FIXUP_SELFTEST powerpc=n
+HCALL_STATS ppc64=n
+IOMMU_VMERGE ppc64=n
+IRQSTACKS powerpc=n
+KPROBES powerpc=y
+MPC5121_GENERIC ppc=n
+MSI_BITMAP_SELFTEST powerpc=n
+OPROFILE powerpc=m
+OPROFILE_IBS powerpc=n
+PHYP_DUMP ppc64=n
+POWER4_ONLY ppc64=n
+PPC601_SYNC_FIX ppc=y
+PPC_BESTCOMM ppc=m
+PPC_BESTCOMM_ATA ppc=m
+PPC_BESTCOMM_FEC ppc=m
+PPC_BESTCOMM_GEN_BD ppc=m
+PPC_CELLEB ppc64=y
+PPC_CELL_QPACE ppc64=y
+PPC_DISABLE_WERROR powerpc=y
+PPC_EARLY_DEBUG powerpc=n
+PPC_EMULATED_STATS powerpc=n
+PPC_ISERIES ppc64=y
+PPC_MPC5200_GPIO ppc=y
+PPC_PREP ppc=y
+PPC_UDBG_BEAT ppc64=y
+PREP_RESIDUAL ppc=y
+PRINT_STACK_DEPTH powerpc=64
+PROC_DEVICETREE powerpc=y
+PROC_PREPRESIDUAL ppc=y
+SCANLOG ppc64=n
+SECCOMP powerpc=y
+SIMPLE_GPIO powerpc=y
+SPU_FS_64K_LS ppc64=y
+SWIOTLB powerpc=n
+TUNE_CELL ppc64=n
+VIOCD ppc64=n
+VIODASD ppc64=n
+VIOTAPE ppc64=n
+VIRQ_DEBUG powerpc=n
+VIRT_CPU_ACCOUNTING ppc64=y
+XMON powerpc=n

diff --git a/kernel-x86.config b/kernel-x86.config
index 86dadc3127b93580d04b48ffdb64cf1b69ac4044..7f7c771fb02686b6cb6a97f084ffd1340d9cba04 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -16,6 +16,9 @@ X86_GOLDFISH all=n
 X86_INTEL_MID all=n
 X86_INTEL_QUARK i386=y
 X86_INTEL_LPSS all=y
+X86_AMD_PLATFORM_DEVICE all=y
+IOSF_MBI all=y
+IOSF_MBI_DEBUG all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
 STA2X11 all=y
@@ -27,8 +30,11 @@ PARAVIRT_DEBUG x86=n
 PARAVIRT_SPINLOCKS x86=n
 #- file arch/x86/xen/Kconfig goes here
 KVM_GUEST x86=y
+ARCH_CPUIDLE_HALTPOLL all=y
 PVH x86=y
 PARAVIRT_TIME_ACCOUNTING x86=y
+JAILHOUSE_GUEST all=y
+ACRN_GUEST all=y
 INTEL_TDX_GUEST x86_64=y
 #- file arch/x86/Kconfig.cpu goes here
 HPET_TIMER x86=y
@@ -38,10 +44,12 @@ MAXSMP i386=n x86_64=n
 NR_CPUS i386=32 x86_64=512
 SCHED_SMT x86=y
 SCHED_MC x86=y
+SCHED_MC_PRIO all=y
 X86_UP_APIC i386=y
 X86_UP_IOAPIC i386=y
 X86_REROUTE_FOR_BROKEN_BOOT_IRQS i386=y x86_64=y
 X86_MCE x86=y
+X86_MCELOG_LEGACY all=y
 X86_MCE_INTEL all=y
 X86_MCE_AMD all=y
 X86_ANCIENT_MCE all=y
@@ -82,12 +90,15 @@ MTRR_SANITIZER x86=y
 MTRR_SANITIZER_ENABLE_DEFAULT x86=1
 MTRR_SANITIZER_SPARE_REG_NR_DEFAULT x86=1
 X86_PAT x86=y
+X86_KERNEL_IBT all=n
 X86_INTEL_MEMORY_PROTECTION_KEYS all=y
 X86_INTEL_TSX_MODE_OFF x86=y
 X86_INTEL_TSX_MODE_ON x86=n
 X86_INTEL_TSX_MODE_AUTO x86=n
+X86_SGX all=y
 EFI x86=y
 EFI_STUB all=y
+EFI_MIXED all=y
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
 CRASH_DUMP x86=n
@@ -96,6 +107,7 @@ PHYSICAL_START x86=0x1000000
 RELOCATABLE i386=y x86_64=y
 RANDOMIZE_BASE i386=y x86_64=y
 PHYSICAL_ALIGN x86=0x1000000
+RANDOMIZE_MEMORY all=y
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
 DEBUG_HOTPLUG_CPU0 all=n
@@ -103,8 +115,10 @@ COMPAT_VDSO x86=n
 LEGACY_VSYSCALL_XONLY all=y
 LEGACY_VSYSCALL_NONE all=n
 CMDLINE_BOOL x86=n
+STRICT_SIGALTSTACK_SIZE all=y
 #- file kernel/livepatch/Kconfig goes here
 SPECULATION_MITIGATIONS x86=y
+PAGE_TABLE_ISOLATION all=y
 RETPOLINE x86=y
 RETHUNK x86_64=y
 CPU_UNRET_ENTRY x86_64=y
@@ -135,6 +149,7 @@ ALIX i486=y i586=y i686=y
 NET5501 i486=y i586=y i686=y
 GEOS i486=y i586=y i686=y
 IA32_EMULATION x86_64=y
+X86_X32_ABI all=y
 #- file arch/x86/kvm/Kconfig goes here
 #- file arch/x86/Kconfig.assembler goes here
 
@@ -177,6 +192,11 @@ CPU_SUP_CENTAUR x86=y
 #-
 #- *** FILE: arch/x86/events/Kconfig ***
 #-
+PERF_EVENTS_INTEL_UNCORE all=m
+PERF_EVENTS_INTEL_RAPL all=m
+PERF_EVENTS_INTEL_CSTATE all=m
+PERF_EVENTS_AMD_POWER all=m
+PERF_EVENTS_AMD_UNCORE all=m
 PERF_EVENTS_AMD_BRS x86=y
 
 #-
@@ -195,7 +215,12 @@ KVM_XEN all=y
 #- *** FILE: arch/x86/xen/Kconfig ***
 #-
 XEN x86=y
+XEN_PV all=y
+XEN_512GB all=y
+XEN_PVHVM all=y
+XEN_PVHVM_GUEST all=y
 XEN_DEBUG_FS x86=n
+XEN_PVH all=y
 
 #-
 #- *** FILE: drivers/acpi/Kconfig ***