Move s390x configuration to debian/config/s390x

svn path=/dists/trunk/linux/; revision=20737

3 files changed, 4 insertions, 197 deletions

diff --git a/debian/config/s390/config b/debian/config/s390/config
deleted file mode 100644
index c664c09b96e1..000000000000
--- a/debian/config/s390/config
+++ /dev/null
@@ -1,184 +0,0 @@
-##
-## file: arch/s390/Kconfig
-##
-CONFIG_COMPAT=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
-CONFIG_HOTPLUG_CPU=y
-CONFIG_MATHEMU=y
-CONFIG_PACK_STACK=y
-# CONFIG_CHECK_STACK is not set
-CONFIG_QDIO=y
-# CONFIG_ZFCPDUMP is not set
-CONFIG_SECCOMP=y
-CONFIG_PFAULT=y
-# CONFIG_SHARED_KERNEL is not set
-CONFIG_CMM=y
-CONFIG_CMM_IUCV=y
-CONFIG_APPLDATA_BASE=y
-CONFIG_APPLDATA_MEM=m
-CONFIG_APPLDATA_OS=m
-CONFIG_APPLDATA_NET_SUM=m
-CONFIG_S390_HYPFS_FS=y
-CONFIG_S390_GUEST=y
-
-##
-## file: arch/s390/kvm/Kconfig
-##
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-
-##
-## file: block/partitions/Kconfig
-##
-CONFIG_IBM_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-
-##
-## file: drivers/block/Kconfig
-##
-# CONFIG_CDROM_PKTCDVD is not set
-
-##
-## file: drivers/crypto/Kconfig
-##
-CONFIG_ZCRYPT=m
-CONFIG_CRYPTO_SHA1_S390=m
-CONFIG_CRYPTO_SHA256_S390=m
-CONFIG_CRYPTO_SHA512_S390=m
-CONFIG_CRYPTO_DES_S390=m
-CONFIG_CRYPTO_AES_S390=m
-CONFIG_S390_PRNG=m
-
-##
-## file: drivers/input/touchscreen/Kconfig
-##
-# CONFIG_INPUT_TOUCHSCREEN is not set
-
-##
-## file: drivers/memstick/Kconfig
-##
-# CONFIG_MEMSTICK is not set
-
-##
-## file: drivers/net/appletalk/Kconfig
-##
-# CONFIG_ATALK is not set
-
-##
-## file: drivers/net/ppp/Kconfig
-##
-# CONFIG_PPP is not set
-
-##
-## file: drivers/net/slip/Kconfig
-##
-# CONFIG_SLIP is not set
-
-##
-## file: drivers/net/wan/Kconfig
-##
-# CONFIG_WAN is not set
-
-##
-## file: drivers/s390/block/Kconfig
-##
-CONFIG_BLK_DEV_XPRAM=m
-CONFIG_DCSSBLK=m
-CONFIG_DASD=m
-# CONFIG_DASD_PROFILE is not set
-CONFIG_DASD_ECKD=m
-CONFIG_DASD_FBA=m
-CONFIG_DASD_DIAG=m
-# CONFIG_DASD_EER is not set
-
-##
-## file: drivers/s390/char/Kconfig
-##
-CONFIG_TN3270=y
-CONFIG_TN3270_TTY=y
-CONFIG_TN3270_FS=m
-CONFIG_TN3270_CONSOLE=y
-CONFIG_TN3215=y
-CONFIG_TN3215_CONSOLE=y
-CONFIG_SCLP_TTY=y
-CONFIG_SCLP_CONSOLE=y
-CONFIG_SCLP_VT220_TTY=y
-CONFIG_SCLP_VT220_CONSOLE=y
-CONFIG_SCLP_CPI=m
-CONFIG_S390_TAPE=m
-CONFIG_S390_TAPE_34XX=m
-CONFIG_S390_TAPE_3590=m
-CONFIG_VMLOGRDR=m
-CONFIG_VMCP=m
-CONFIG_MONREADER=m
-CONFIG_MONWRITER=m
-CONFIG_S390_VMUR=m
-
-##
-## file: drivers/s390/net/Kconfig
-##
-CONFIG_LCS=m
-CONFIG_CTCM=m
-CONFIG_NETIUCV=m
-CONFIG_SMSGIUCV=y
-CONFIG_CLAW=m
-CONFIG_QETH=m
-CONFIG_QETH_L2=m
-CONFIG_QETH_L3=m
-
-##
-## file: drivers/scsi/Kconfig
-##
-CONFIG_ZFCP=m
-
-##
-## file: drivers/tty/hvc/Kconfig
-##
-CONFIG_HVC_IUCV=y
-
-##
-## file: drivers/watchdog/Kconfig
-##
-CONFIG_ZVM_WATCHDOG=m
-
-##
-## file: mm/Kconfig
-##
-## choice: Memory model
-# CONFIG_FLATMEM_MANUAL is not set
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
-## end choice
-
-##
-## file: net/atm/Kconfig
-##
-# CONFIG_ATM is not set
-
-##
-## file: net/decnet/Kconfig
-##
-# CONFIG_DECNET is not set
-
-##
-## file: net/ipx/Kconfig
-##
-# CONFIG_IPX is not set
-
-##
-## file: net/iucv/Kconfig
-##
-CONFIG_IUCV=y
-CONFIG_AFIUCV=m
-
-##
-## file: net/lapb/Kconfig
-##
-# CONFIG_LAPB is not set
-
-##
-## file: net/llc/Kconfig
-##
-# CONFIG_LLC2 is not set
-
diff --git a/debian/config/s390/config.s390x b/debian/config/s390/config.s390x
deleted file mode 100644
index 3b6fb2a26104..000000000000
--- a/debian/config/s390/config.s390x
+++ /dev/null
@@ -1,13 +0,0 @@
-##
-## file: arch/s390/Kconfig
-##
-## choice: Processor type
-# CONFIG_MARCH_G5 is not set
-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_64BIT=y
-CONFIG_PCI=y
-
diff --git a/debian/config/s390/defines b/debian/config/s390/defines
index 753b3eb09a6d..a880716da747 100644
--- a/debian/config/s390/defines
+++ b/debian/config/s390/defines
@@ -5,6 +5,7 @@ kernel-arch: s390
 
 [image]
 bootloaders: s390-tools
+configs: s390x/config
 
 [s390x_build]
 debug-info: true
@@ -12,3 +13,6 @@ debug-info: true
 [s390x_description]
 hardware: IBM zSeries
 
+[s390x_image]
+configs: s390x/config.s390x
+