Various Kconfig and Makefile.inc fixes and cosmetics.

 - Whitespace fixes, remove trailing whitespace, use TABs for identation
   (except in Kconfig "help" lines, which start with one TAB and two spaces
   as per Linux kernel style)

 - Kconfig: Standardize on 'bool' (not 'boolean').

 - s/lar/cbfs/ in one Kconfig help string.

 - Reword various Kconfig menu entries for a more usable and consistent menu.

 - Fix incorrect comment of NO_RUN in devices/Kconfig.

 - superio/serverengines/Kconfig: Incorrect config name.

 - superio/Makefile.inc: s/serverengine/serverengines/.

 - superio/intel/Kconfig: s/SUPERIO_FINTEK_I3100/SUPERIO_INTEL_I3100/.

 - mainboard/via/vt8454c/Kconfig: Fix copy-paste error in help string.

 - mainboard/via/epia-n/Kconfig: Fix "bool" menu text.

 - console/Kconfig: Don't mention defaults in the menu string, kconfig
   already displays them anyway.

 - Kill "Drivers" menu for now, it only confuses users as long as it's emtpy.

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@4567 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

38 files changed, 46 insertions, 47 deletions

diff --git a/src/superio/Makefile.inc b/src/superio/Makefile.inc
index c6f088837a..d662a3fb79 100644
--- a/src/superio/Makefile.inc
+++ b/src/superio/Makefile.inc
@@ -1,9 +1,8 @@
-
 subdirs-y += fintek 
 subdirs-y += intel
 subdirs-y += ite
 subdirs-y += nsc
-#subdirs-y += serverengine
+# subdirs-y += serverengines
 subdirs-y += smsc
 subdirs-y += via
 subdirs-y += winbond
diff --git a/src/superio/fintek/f71805f/Makefile.inc b/src/superio/fintek/f71805f/Makefile.inc
index 8dc10a63d4..d56723dc4d 100644
--- a/src/superio/fintek/f71805f/Makefile.inc
+++ b/src/superio/fintek/f71805f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_FINTEK_F71805F) +=  superio.o
+obj-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.o
 
diff --git a/src/superio/intel/Kconfig b/src/superio/intel/Kconfig
index 39652b0fbb..a7aca7d35d 100644
--- a/src/superio/intel/Kconfig
+++ b/src/superio/intel/Kconfig
@@ -1,2 +1,2 @@
-config SUPERIO_FINTEK_I3100
+config SUPERIO_INTEL_I3100
 	bool
diff --git a/src/superio/intel/i3100/Makefile.inc b/src/superio/intel/i3100/Makefile.inc
index 9cf0033acd..e622b7205b 100644
--- a/src/superio/intel/i3100/Makefile.inc
+++ b/src/superio/intel/i3100/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_INTEL_I3100) +=  superio.o
+obj-$(CONFIG_SUPERIO_INTEL_I3100) += superio.o
 
diff --git a/src/superio/ite/it8661f/Makefile.inc b/src/superio/ite/it8661f/Makefile.inc
index d37f3ea637..8a17ae2c86 100644
--- a/src/superio/ite/it8661f/Makefile.inc
+++ b/src/superio/ite/it8661f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8661F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8661F) += superio.o
 
diff --git a/src/superio/ite/it8671f/Makefile.inc b/src/superio/ite/it8671f/Makefile.inc
index 6f047caed3..32c26227de 100644
--- a/src/superio/ite/it8671f/Makefile.inc
+++ b/src/superio/ite/it8671f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8671F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8671F) += superio.o
 
diff --git a/src/superio/ite/it8673f/Makefile.inc b/src/superio/ite/it8673f/Makefile.inc
index 4d89bcec97..f4ee01cec6 100644
--- a/src/superio/ite/it8673f/Makefile.inc
+++ b/src/superio/ite/it8673f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8673F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8673F) += superio.o
 
diff --git a/src/superio/ite/it8705f/Makefile.inc b/src/superio/ite/it8705f/Makefile.inc
index db495c9f1a..468c0e8aec 100644
--- a/src/superio/ite/it8705f/Makefile.inc
+++ b/src/superio/ite/it8705f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8705F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8705F) += superio.o
 
diff --git a/src/superio/ite/it8712f/Makefile.inc b/src/superio/ite/it8712f/Makefile.inc
index 7f293b485d..898c87906e 100644
--- a/src/superio/ite/it8712f/Makefile.inc
+++ b/src/superio/ite/it8712f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8712F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.o
 
diff --git a/src/superio/ite/it8716f/Makefile.inc b/src/superio/ite/it8716f/Makefile.inc
index bf0a70c79a..cb7ac32c40 100644
--- a/src/superio/ite/it8716f/Makefile.inc
+++ b/src/superio/ite/it8716f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8716F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.o
 
diff --git a/src/superio/ite/it8718f/Makefile.inc b/src/superio/ite/it8718f/Makefile.inc
index 00ef7443b6..9b28eb92fb 100644
--- a/src/superio/ite/it8718f/Makefile.inc
+++ b/src/superio/ite/it8718f/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_ITE_IT8718F) +=  superio.o
+obj-$(CONFIG_SUPERIO_ITE_IT8718F) += superio.o
 
diff --git a/src/superio/nsc/pc8374/Makefile.inc b/src/superio/nsc/pc8374/Makefile.inc
index d001b57c42..e1fd7ce402 100644
--- a/src/superio/nsc/pc8374/Makefile.inc
+++ b/src/superio/nsc/pc8374/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC8374) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC8374) += superio.o
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index 9fde44e0c6..204f9e2bb3 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -19,5 +19,5 @@
 ## 
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87309) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87309) += superio.o
 
diff --git a/src/superio/nsc/pc87351/Makefile.inc b/src/superio/nsc/pc87351/Makefile.inc
index 93206adbaa..047842d852 100644
--- a/src/superio/nsc/pc87351/Makefile.inc
+++ b/src/superio/nsc/pc87351/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87351) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87351) += superio.o
diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc
index 0cb7abc104..823f7105c8 100644
--- a/src/superio/nsc/pc87360/Makefile.inc
+++ b/src/superio/nsc/pc87360/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87360) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87360) += superio.o
diff --git a/src/superio/nsc/pc87366/Makefile.inc b/src/superio/nsc/pc87366/Makefile.inc
index 7251d8cf8b..90bf08f7ba 100644
--- a/src/superio/nsc/pc87366/Makefile.inc
+++ b/src/superio/nsc/pc87366/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87366) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87366) += superio.o
diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc
index 65727440a1..da23083bde 100644
--- a/src/superio/nsc/pc87417/Makefile.inc
+++ b/src/superio/nsc/pc87417/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87417) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87417) += superio.o
diff --git a/src/superio/nsc/pc87427/Makefile.inc b/src/superio/nsc/pc87427/Makefile.inc
index a5e47bac23..27c10ee882 100644
--- a/src/superio/nsc/pc87427/Makefile.inc
+++ b/src/superio/nsc/pc87427/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC87427) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC87427) += superio.o
diff --git a/src/superio/nsc/pc97307/Makefile.inc b/src/superio/nsc/pc97307/Makefile.inc
index 548504c645..40d962f0e4 100644
--- a/src/superio/nsc/pc97307/Makefile.inc
+++ b/src/superio/nsc/pc97307/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC97307) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC97307) += superio.o
diff --git a/src/superio/nsc/pc97317/Makefile.inc b/src/superio/nsc/pc97317/Makefile.inc
index feda33b856..d77f0c22f7 100644
--- a/src/superio/nsc/pc97317/Makefile.inc
+++ b/src/superio/nsc/pc97317/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_NSC_PC97317) +=  superio.o
+obj-$(CONFIG_SUPERIO_NSC_PC97317) += superio.o
diff --git a/src/superio/serverengines/Kconfig b/src/superio/serverengines/Kconfig
index 5fb2304067..dfb803f992 100644
--- a/src/superio/serverengines/Kconfig
+++ b/src/superio/serverengines/Kconfig
@@ -1,2 +1,2 @@
-config SERVERENGINES_ITE_PILOT
+config SUPERIO_SERVERENGINES_PILOT
 	bool
diff --git a/src/superio/smsc/fdc37m60x/Makefile.inc b/src/superio/smsc/fdc37m60x/Makefile.inc
index a2bf48097f..2ba5572bcc 100644
--- a/src/superio/smsc/fdc37m60x/Makefile.inc
+++ b/src/superio/smsc/fdc37m60x/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_FDC37M60X) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.o
 
diff --git a/src/superio/smsc/lpc47b272/Makefile.inc b/src/superio/smsc/lpc47b272/Makefile.inc
index 031d5df8ca..b63e6835f1 100644
--- a/src/superio/smsc/lpc47b272/Makefile.inc
+++ b/src/superio/smsc/lpc47b272/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_DEVICE) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_DEVICE) += superio.o
 
diff --git a/src/superio/smsc/lpc47b397/Makefile.inc b/src/superio/smsc/lpc47b397/Makefile.inc
index ff7f93f412..79145f2697 100644
--- a/src/superio/smsc/lpc47b397/Makefile.inc
+++ b/src/superio/smsc/lpc47b397/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_LPC47B397) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_LPC47B397) += superio.o
diff --git a/src/superio/smsc/lpc47m10x/Makefile.inc b/src/superio/smsc/lpc47m10x/Makefile.inc
index 47cbf6b805..8a51d63445 100644
--- a/src/superio/smsc/lpc47m10x/Makefile.inc
+++ b/src/superio/smsc/lpc47m10x/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_LPC47M10X) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += superio.o
diff --git a/src/superio/smsc/lpc47n217/Makefile.inc b/src/superio/smsc/lpc47n217/Makefile.inc
index edde7624dc..fa7729d809 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -19,4 +19,4 @@
 ## 
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_LPC47N217) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.o
diff --git a/src/superio/smsc/smscsuperio/Makefile.inc b/src/superio/smsc/smscsuperio/Makefile.inc
index f5d42787a0..f1e24ab9de 100644
--- a/src/superio/smsc/smscsuperio/Makefile.inc
+++ b/src/superio/smsc/smscsuperio/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) +=  superio.o
+obj-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += superio.o
 
diff --git a/src/superio/via/vt1211/Makefile.inc b/src/superio/via/vt1211/Makefile.inc
index 827c9f9d3a..27ff73b48a 100644
--- a/src/superio/via/vt1211/Makefile.inc
+++ b/src/superio/via/vt1211/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_VIA_VT1211) +=  vt1211.o
+obj-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.o
diff --git a/src/superio/winbond/Kconfig b/src/superio/winbond/Kconfig
index 24825a7f9b..63168cfa29 100644
--- a/src/superio/winbond/Kconfig
+++ b/src/superio/winbond/Kconfig
@@ -1,18 +1,18 @@
 config SUPERIO_WINBOND_W83627DHG
-	boolean
+	bool
 config SUPERIO_WINBOND_W83627EHG
-	boolean
+	bool
 config SUPERIO_WINBOND_W83627HF
-	boolean
+	bool
 config SUPERIO_WINBOND_W83627THF
-	boolean
+	bool
 config SUPERIO_WINBOND_W83627THG
-	boolean
+	bool
 config SUPERIO_WINBOND_W83627UHG
-	boolean
+	bool
 config SUPERIO_WINBOND_W83697HF
-	boolean
+	bool
 config SUPERIO_WINBOND_W83977F
-	boolean
+	bool
 config SUPERIO_WINBOND_W83977TF
-	boolean
+	bool
diff --git a/src/superio/winbond/w83627dhg/Makefile.inc b/src/superio/winbond/w83627dhg/Makefile.inc
index 168d803ac1..cdec98d0b8 100644
--- a/src/superio/winbond/w83627dhg/Makefile.inc
+++ b/src/superio/winbond/w83627dhg/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627DHG) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += superio.o
 
diff --git a/src/superio/winbond/w83627ehg/Makefile.inc b/src/superio/winbond/w83627ehg/Makefile.inc
index d52c5ebc94..9b56268aef 100644
--- a/src/superio/winbond/w83627ehg/Makefile.inc
+++ b/src/superio/winbond/w83627ehg/Makefile.inc
@@ -20,5 +20,5 @@
 ## 
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627EHG) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.o
 
diff --git a/src/superio/winbond/w83627hf/Makefile.inc b/src/superio/winbond/w83627hf/Makefile.inc
index 7f393c1660..4ecaa404ee 100644
--- a/src/superio/winbond/w83627hf/Makefile.inc
+++ b/src/superio/winbond/w83627hf/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627HF) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.o
diff --git a/src/superio/winbond/w83627thf/Makefile.inc b/src/superio/winbond/w83627thf/Makefile.inc
index 2c74921e14..6a222c046f 100644
--- a/src/superio/winbond/w83627thf/Makefile.inc
+++ b/src/superio/winbond/w83627thf/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627THF) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627THF) += superio.o
diff --git a/src/superio/winbond/w83627thg/Makefile.inc b/src/superio/winbond/w83627thg/Makefile.inc
index ea60c2fa20..c14898fb1a 100644
--- a/src/superio/winbond/w83627thg/Makefile.inc
+++ b/src/superio/winbond/w83627thg/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627THG) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.o
diff --git a/src/superio/winbond/w83627uhg/Makefile.inc b/src/superio/winbond/w83627uhg/Makefile.inc
index 58dd621234..6fe6f5be55 100644
--- a/src/superio/winbond/w83627uhg/Makefile.inc
+++ b/src/superio/winbond/w83627uhg/Makefile.inc
@@ -19,4 +19,4 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83627UHG) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.o
diff --git a/src/superio/winbond/w83697hf/Makefile.inc b/src/superio/winbond/w83697hf/Makefile.inc
index 72fb90dd9a..31f9c12e71 100644
--- a/src/superio/winbond/w83697hf/Makefile.inc
+++ b/src/superio/winbond/w83697hf/Makefile.inc
@@ -19,4 +19,4 @@
 ##
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83697HF) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.o
diff --git a/src/superio/winbond/w83977f/Makefile.inc b/src/superio/winbond/w83977f/Makefile.inc
index 7f394cbb3d..2a91ad0a16 100644
--- a/src/superio/winbond/w83977f/Makefile.inc
+++ b/src/superio/winbond/w83977f/Makefile.inc
@@ -19,4 +19,4 @@
 ## 
 
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83977F) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.o
diff --git a/src/superio/winbond/w83977tf/Makefile.inc b/src/superio/winbond/w83977tf/Makefile.inc
index 07fc338b1c..dc3cda711c 100644
--- a/src/superio/winbond/w83977tf/Makefile.inc
+++ b/src/superio/winbond/w83977tf/Makefile.inc
@@ -1,2 +1,2 @@
 #config chip.h
-obj-$(CONFIG_SUPERIO_WINBOND_W83977TF) +=  superio.o
+obj-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.o