[S390] Kconfig: add machine type number to code generation options

Add machine type number to code generation options. Also clean up and
shorten quite a lot of help texts with respect to machine type and
architecture terminology.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 23 insertions, 26 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index fabb40bc4e19..97146ab157e6 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -144,7 +144,7 @@ source "kernel/time/Kconfig"
 config 64BIT
         bool "64 bit kernel"
         help
-          Select this option if you have a 64 bit IBM zSeries machine
+          Select this option if you have an IBM z/Architecture machine
           and want to use the 64 bit addressing mode.
 
 config 32BIT
@@ -208,7 +208,7 @@ config MATHEMU
         depends on MARCH_G5
         help
           This option is required for IEEE compliant floating point arithmetic
-          on older S/390 machines. Say Y unless you know your machine doesn't
+          on older ESA/390 machines. Say Y unless you know your machine doesn't
           need this.
 
 config COMPAT
@@ -237,8 +237,8 @@ config S390_EXEC_PROTECT
           space programs and it also selects the addressing mode option above.
           The kernel parameter noexec=on will enable this feature and also
           switch the addressing modes, default is disabled. Enabling this (via
-          kernel parameter) on machines earlier than IBM System z9-109 EC/BC
-          will reduce system performance.
+          kernel parameter) on machines earlier than IBM System z9 this will
+          reduce system performance.
 
 comment "Code generation options"
 
@@ -247,49 +247,46 @@ choice
         default MARCH_G5
 
 config MARCH_G5
-        bool "S/390 model G5 and G6"
+        bool "System/390 model G5 and G6"
         depends on !64BIT
         help
           Select this to build a 31 bit kernel that works
-          on all S/390 and zSeries machines.
+          on all ESA/390 and z/Architecture machines.
 
 config MARCH_Z900
-        bool "IBM eServer zSeries model z800 and z900"
+        bool "IBM zSeries model z800 and z900"
         help
-          Select this to optimize for zSeries machines. This
-          will enable some optimizations that are not available
-          on older 31 bit only CPUs.
+          Select this to enable optimizations for model z800/z900 (2064 and
+          2066 series). This will enable some optimizations that are not
+          available on older ESA/390 (31 Bit) only CPUs.
 
 config MARCH_Z990
-        bool "IBM eServer zSeries model z890 and z990"
+        bool "IBM zSeries model z890 and z990"
         help
-          Select this enable optimizations for model z890/z990.
-          This will be slightly faster but does not work on
-          older machines such as the z900.
+          Select this to enable optimizations for model z890/z990 (2084 and
+          2086 series). The kernel will be slightly faster but will not work
+          on older machines.
 
 config MARCH_Z9_109
         bool "IBM System z9"
         help
-          Select this to enable optimizations for IBM System z9-109, IBM
-          System z9 Enterprise Class (z9 EC), and IBM System z9 Business
-          Class (z9 BC). The kernel will be slightly faster but will not
-          work on older machines such as the z990, z890, z900, and z800.
+          Select this to enable optimizations for IBM System z9 (2094 and
+          2096 series). The kernel will be slightly faster but will not work
+          on older machines.
 
 config MARCH_Z10
         bool "IBM System z10"
         help
-          Select this to enable optimizations for IBM System z10. The
-          kernel will be slightly faster but will not work on older
-          machines such as the z990, z890, z900, z800, z9-109, z9-ec
-          and z9-bc.
+          Select this to enable optimizations for IBM System z10 (2097 and
+          2098 series). The kernel will be slightly faster but will not work
+          on older machines.
 
 config MARCH_Z196
         bool "IBM zEnterprise 196"
         help
-          Select this to enable optimizations for IBM zEnterprise 196.
-          The kernel will be slightly faster but will not work on older
-          machines such as the z990, z890, z900, z800, z9-109, z9-ec,
-          z9-bc, z10-ec and z10-bc.
+          Select this to enable optimizations for IBM zEnterprise 196
+          (2817 series). The kernel will be slightly faster but will not work
+          on older machines.
 
 endchoice