Fix a number of board names in Kconfig (trivial).

Also, simplify the M2V-MX SE Kconfig file a bit while I'm at it.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4688 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

17 files changed, 43 insertions, 53 deletions

diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index 92b329116f..74537fbe03 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -1,5 +1,3 @@
-
-
 ##
 ## This file is part of the coreboot project.
 ##
@@ -19,6 +17,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
+
 config BOARD_AMD_RUMBA
 	bool "Rumba"
 	select ARCH_X86
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 087e6c06a8..ee33b4faed 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -19,7 +19,7 @@
 ##
 
 config BOARD_ASUS_M2V_MX_SE
-	bool "M2V-MX-SE"
+	bool "M2V-MX SE"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
@@ -30,8 +30,12 @@ config BOARD_ASUS_M2V_MX_SE
 	select SUPERIO_ITE_IT8712F
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
+	select HAVE_HARD_RESET
+	select IOAPIC
+	select HAVE_OPTION_TABLE
+	select HAVE_ACPI_TABLES
 	help
-	  Asus M2V-MX-SE mainboard.
+	  Asus M2V-MX SE mainboard.
 
 config MAINBOARD_DIR
 	string
@@ -58,21 +62,6 @@ config APIC_ID_OFFSET
 	default 0x10
 	depends on BOARD_ASUS_M2V_MX_SE
 
-config HAVE_HARD_RESET
-	bool
-	default y
-	depends on BOARD_ASUS_M2V_MX_SE
-
-config IOAPIC
-	bool
-	default y
-	depends on BOARD_ASUS_M2V_MX_SE
-
-config MAINBOARD_VENDOR
-	string
-	default "ASUS"
-	depends on BOARD_ASUS_M2V_MX_SE
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "M2V-MX SE"
@@ -98,16 +87,6 @@ config HEAP_SIZE
 	default 0x40000
 	depends on BOARD_ASUS_M2V_MX_SE
 
-config HAVE_OPTION_TABLE
-	bool
-	default y
-	depends on BOARD_ASUS_M2V_MX_SE
-
-config HAVE_ACPI_TABLES
-	bool
-	default y
-	depends on BOARD_ASUS_M2V_MX_SE
-
 config LB_CKS_RANGE_END
 	int
 	default 122
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index 8cfa632acf..6fe2237899 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_INTEL_JARRELL
-	bool "Jarrell"
+	bool "Jarrell (SE7520JR2)"
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
@@ -9,7 +9,7 @@ config BOARD_INTEL_JARRELL
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	help
-          Intel Jarrell mainboard.
+          Intel Jarrell (SE7520JR2) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index 255ddc393d..906c20a480 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_INTEL_MTARVON
-	bool "Mt. Arvon"
+	bool "3100 devkit (Mt. Arvon)"
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I3100
@@ -8,7 +8,7 @@ config BOARD_INTEL_MTARVON
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	help
-          Intel Mt. Arvon mainboard.
+          Intel 3100 devkit (Mt. Arvon) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 490db9d240..fbf900d9ab 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_INTEL_TRUXTON
-	bool "Truxton"
+	bool "EP80579 devkit (Truxton)"
 	select ARCH_X86
 	select CPU_INTEL_EP80579
 	select NORTHBRIDGE_INTEL_I3100
@@ -9,7 +9,7 @@ config BOARD_INTEL_TRUXTON
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	help
-          Intel Truxton mainboard.
+          Intel EP80579 devkit (Truxton) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index db4dbd3305..ebc338e3fd 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_INTEL_XE7501DEVKIT
-	bool "xe7501 DevKit"
+	bool "XE7501devkit"
 	select ARCH_X86
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
@@ -9,7 +9,7 @@ config BOARD_INTEL_XE7501DEVKIT
 	select HAVE_PIRQ_TABLE
 	select UDELAY_TSC
 	help
-          Intel xe7501 devkit mainboard.
+          Intel XE7501devkit mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index b3184cd27b..0af21d756d 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_KONTRON_986LCD_M
-	bool "986LCD-M"
+	bool "986LCD-M/mITX"
 	select ARCH_X86
 	select CPU_INTEL_CORE
 	select CPU_INTEL_SOCKET_MFCPGA478
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 8cdd1f7da9..c8b68787c0 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_SUNW_ULTRA40
-	bool "Ultra40"
+	bool "Ultra 40"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -11,7 +11,7 @@ config BOARD_SUNW_ULTRA40
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	help
-	 Sun Ultra40.
+	 Sun Ultra 40 mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index c3e857a367..d116b6f7c9 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_SUPERMICRO_H8DME
-	bool "h8dme"
+	bool "H8DME"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
@@ -11,7 +11,7 @@ config BOARD_SUPERMICRO_H8DME
 	select USE_PRINTK_IN_CAR
 	select USE_DCACHE_RAM
 	help
-	 h8dme
+	  Supermicro H8DME mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index abdd98a560..2cfd0e98e3 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -19,7 +19,7 @@
 ##
 
 config BOARD_TYAN_S1846
-	bool "S1846"
+	bool "Tsunami ATX (S1846)"
 	select ARCH_X86
 	select CPU_INTEL_SLOT_2
 	select NORTHBRIDGE_INTEL_I440BX
@@ -29,7 +29,7 @@ config BOARD_TYAN_S1846
 	select PCI_ROM_RUN
 	select CONSOLE_VGA
 	help
-	  Tyan S1846 mainboard.
+	  Tyan Tsunami ATX (S1846) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 6ae7f0ec95..fe5c34e020 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2850
-	bool "Tyan S2850"
+	bool "Tomcat K8S (S2850)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -8,6 +8,8 @@ config BOARD_TYAN_S2850
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
 	select PIRQ_TABLE
+	help
+	  Tyan Tomcat K8S (S2850) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 57e3bab1c9..290c5d5501 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2875
-	bool "Tyan S2875"
+	bool "Tiger K8W (S2875)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -9,6 +9,8 @@ config BOARD_TYAN_S2875
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
 	select PIRQ_TABLE
+	help
+	  Tyan Tiger K8W (S2875) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 32eb1fe308..4ebaecd891 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2881
-	bool "Tyan Thunder K8SR S2881"
+	bool "Thunder K8SR (S2881)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -9,6 +9,8 @@ config BOARD_TYAN_S2881
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SUPERIO_WINBOND_W83627HF
 	select PIRQ_TABLE
+	help
+	  Tyan Thunder K8SR (S2881) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index 2fc08b80c7..5efe2d26dd 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2891
-	bool "Tyan Thunder K8SRE S2891"
+	bool "Thunder K8SRE (S2891)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -9,6 +9,8 @@ config BOARD_TYAN_S2891
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select PIRQ_TABLE
+	help
+	  Tyan Thunder K8SRE (S2891) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 00c4897489..4e5244e615 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2892
-	bool "Tyan Thunder K8SE S2892"
+	bool "Thunder K8SE (S2892)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -9,6 +9,8 @@ config BOARD_TYAN_S2892
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_WINBOND_W83627HF
 	select PIRQ_TABLE
+	help
+	  Tyan Thunder K8SE (S2892) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 331ae941d4..9d74260666 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_TYAN_S2895
-	bool "Tyan Thunder K8WE S2895"
+	bool "Thunder K8WE (S2895)"
 	select ARCH_X86
 	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
@@ -9,6 +9,8 @@ config BOARD_TYAN_S2895
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SUPERIO_SMSC_LPC47B397
 	select PIRQ_TABLE
+	help
+	  Tyan Thunder K8WE (S2895) mainboard.
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index be33783fae..0e88136504 100644
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -1,5 +1,5 @@
 config BOARD_VIA_PC2500E
-	bool "PC2500E"
+	bool "pc2500e"
 	select ARCH_X86
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
@@ -7,7 +7,7 @@ config BOARD_VIA_PC2500E
 	select SUPERIO_ITE_IT8716F
 	select HAVE_PIRQ_TABLE
 	help
-	  VIA PC2500E mainboard.
+	  VIA pc2500e mainboard.
 
 config MAINBOARD_DIR
 	string
@@ -26,7 +26,7 @@ config MAINBOARD_DIR
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "PC2500E"
+	default "pc2500e"
 	depends on BOARD_VIA_PC2500E
 
 config VIDEO_MB