[s390x] Combine and rename kconfig files to the default per-arch filename
Since we no longer build any kernel packages for s390, there is no reason to keep these files under kernelarch-s390, or to keep them separate from each other.
This commit is contained in:
parent
c063297a1c
commit
9198664479
|
@ -1,17 +0,0 @@
|
|||
##
|
||||
## file: arch/s390/Kconfig
|
||||
##
|
||||
## choice: Processor type
|
||||
CONFIG_MARCH_Z900=y
|
||||
# CONFIG_MARCH_Z990 is not set
|
||||
# CONFIG_MARCH_Z9_109 is not set
|
||||
# CONFIG_MARCH_Z10 is not set
|
||||
## end choice
|
||||
CONFIG_PCI=y
|
||||
|
||||
##
|
||||
## file: drivers/pci/hotplug/Kconfig
|
||||
##
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_S390=y
|
||||
|
|
@ -1,6 +1,12 @@
|
|||
##
|
||||
## file: arch/s390/Kconfig
|
||||
##
|
||||
## choice: Processor type
|
||||
CONFIG_MARCH_Z900=y
|
||||
# CONFIG_MARCH_Z990 is not set
|
||||
# CONFIG_MARCH_Z9_109 is not set
|
||||
# CONFIG_MARCH_Z10 is not set
|
||||
## end choice
|
||||
CONFIG_COMPAT=y
|
||||
CONFIG_SMP=y
|
||||
CONFIG_NR_CPUS=32
|
||||
|
@ -9,6 +15,7 @@ CONFIG_SCHED_TOPOLOGY=y
|
|||
CONFIG_PACK_STACK=y
|
||||
# CONFIG_CHECK_STACK is not set
|
||||
CONFIG_QDIO=y
|
||||
CONFIG_PCI=y
|
||||
CONFIG_PCI_NR_FUNCTIONS=64
|
||||
CONFIG_PCI_NR_MSI=256
|
||||
CONFIG_CHSC_SCH=m
|
||||
|
@ -90,6 +97,12 @@ CONFIG_S390_PRNG=m
|
|||
##
|
||||
# CONFIG_WAN is not set
|
||||
|
||||
##
|
||||
## file: drivers/pci/hotplug/Kconfig
|
||||
##
|
||||
CONFIG_HOTPLUG_PCI=y
|
||||
CONFIG_HOTPLUG_PCI_S390=y
|
||||
|
||||
##
|
||||
## file: drivers/s390/block/Kconfig
|
||||
##
|
|
@ -9,7 +9,6 @@ vdso: true
|
|||
|
||||
[image]
|
||||
bootloaders: s390-tools
|
||||
configs:
|
||||
install-stem: vmlinuz
|
||||
|
||||
[relations]
|
||||
|
@ -20,7 +19,3 @@ debug-info: true
|
|||
|
||||
[s390x_description]
|
||||
hardware: IBM zSeries
|
||||
|
||||
[s390x_image]
|
||||
configs: kernelarch-s390/config-arch-64
|
||||
|
||||
|
|
Loading…
Reference in New Issue