summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:54:44 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-11-17 10:54:44 (GMT)
commitcb52ec6051c120a64fc79170d82c7e08d367f88a (patch)
tree20dffcb6fbab1bf3a03cea64a05333615a5affaa /config
parent7ea82181db30cd437967e7bca1177f8cbd2f6fc5 (diff)
arch/s390: commonalise the 32- and 64-bit s390 arch
Diffstat (limited to 'config')
-rw-r--r--config/arch/s390.in8
-rw-r--r--config/arch/s390x.in10
2 files changed, 6 insertions, 12 deletions
diff --git a/config/arch/s390.in b/config/arch/s390.in
index c7a8299..519be80 100644
--- a/config/arch/s390.in
+++ b/config/arch/s390.in
@@ -2,8 +2,12 @@
# depends on EXPERIMENTAL
config ARCH_s390
+ select ARCH_SUPPORTS_32
+ select ARCH_SUPPORTS_64
+ select ARCH_DEFAULT_32
select ARCH_USE_MMU
select ARCH_SUPPORT_FPU
help
- The IBM ESA/390 architecture, as defined by:
- http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
+ Defined by IBM in:
+ 32-bit ESA/390 : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9ar008/CCONTENTS
+ 64-bit z/Architecure : http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS
diff --git a/config/arch/s390x.in b/config/arch/s390x.in
deleted file mode 100644
index 7b8da26..0000000
--- a/config/arch/s390x.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# s390x specific config options
-# depends on EXPERIMENTAL
-
-config ARCH_s390x
- select ARCH_64
- select ARCH_USE_MMU
- select ARCH_SUPPORT_FPU
- help
- The IBM z/Architecture, as defined by:
- http://publibfp.boulder.ibm.com/cgi-bin/bookmgr/BOOKS/dz9zr002/CCONTENTS