More kconfig cleanups:

 - Use "default n" for all components that shall be "select"ed.

 - Use "0x0" instead of "0" for hex variables for clarity and to reduce
   the risk of people passing integer instead of hex values to such variables.

 - Add TODO comments for boards that have irq_tables.c but don' set
   CONFIG_HAVE_PIRQ_TABLE = 1. Someone with the hardware should test enabling.

 - ASUS M2V-MX SE doesn't have irq_tables.c so don't define
   IRQ_SLOT_COUNT in its Kconfig file.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4749 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 6458037497f04e8cdbc09047db43d9ac2aed0e2e..5ffc3563e5ce4b9292fd5ffc58aecf684006bf10 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -56,11 +56,11 @@ config PCI_BUS_SEGN_BITS
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
        hex
-       default 0
+       default 0x0
 
 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
        hex
-       default 0
+       default 0x0
 
 config CPU_ADDR_BITS
        int
@@ -68,7 +68,7 @@ config CPU_ADDR_BITS
 
 config AGP_APERTURE_SIZE
        hex
-       default 0
+       default 0x0
 
 config XIP_ROM_BASE
        hex
@@ -174,7 +174,7 @@ config USE_FAILOVER_IMAGE
 
 config HAVE_HARD_RESET
        bool
-       default 0
+       default n
 
 config HAVE_INIT_TIMER
        bool

diff --git a/src/arch/i386/Kconfig b/src/arch/i386/Kconfig
index 8481cf6f067a2c1b6d3c1b5357df5c74a8a57939..64c96d7a64c91bf8be4969c266d60d125e11e35d 100644 (file)
--- a/src/arch/i386/Kconfig
+++ b/src/arch/i386/Kconfig
@@ -29,7 +29,7 @@ config ROMBASE
 
 config PAYLOAD_SIZE
        hex
-       default 0
+       default 0x0
 
 config ROM_PAYLOAD_START
        hex

diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index ebe5dec07fefe9fb3e7f345dd3ab4fad781572ee..74198994bdd9ae417b8f479c779bf9dd38226010 100644 (file)
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -19,7 +19,7 @@ config DCACHE_RAM_SIZE
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
        hex
-       default 0
+       default 0x0
 
 config MAX_PHYSICAL_CPUS
        int

diff --git a/src/cpu/amd/socket_F_1207/Kconfig b/src/cpu/amd/socket_F_1207/Kconfig
index c5e1be495a1b798428baa803999a937f6f9749a7..de64165a378d65ae1c03e627de225579cbb1980e 100644 (file)
--- a/src/cpu/amd/socket_F_1207/Kconfig
+++ b/src/cpu/amd/socket_F_1207/Kconfig
@@ -41,5 +41,5 @@ config CBB
 
 config CDB
        hex
-       default 0
+       default 0x0
        depends on CPU_AMD_SOCKET_F_1207

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 0a39eae9ced71eb12af813ee17296a66a558279e..f1ab0ffbc57a031796e652b9977c85b59d8409d3 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -115,8 +115,3 @@ config HT_CHAIN_END_UNITID_BASE
        default 0x20
        depends on BOARD_ASUS_M2V_MX_SE
 
-# FIXME?
-config IRQ_SLOT_COUNT
-       int
-       default 11
-       depends on BOARD_ASUS_M2V_MX_SE

diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb
index de0b1d2f21717e1983f3e12889d5365fd503b39a..16264f27540487a52482b867983852df04e5f54d 100644 (file)
--- a/src/mainboard/iei/juki-511p/Options.lb
+++ b/src/mainboard/iei/juki-511p/Options.lb
@@ -69,10 +69,10 @@ default CONFIG_UDELAY_IO=1
 ##
 ## Build code to export a programmable irq routing table
 ##
+# FIXME: There's an irq_tables.c file, but CONFIG_HAVE_PIRQ_TABLE is 0.
 default CONFIG_HAVE_PIRQ_TABLE=0
 default CONFIG_IRQ_SLOT_COUNT=2
 default CONFIG_PIRQ_ROUTE=1
-#object irq_tables.o
 
 ##
 ## Build code to export a CMOS option table

diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb
index 85f2928fd1b9b212326ce8533de750cf8200c0c1..683b19b2ab42957988ca6fab11d4e8095572c05f 100644 (file)
--- a/src/mainboard/televideo/tc7020/Options.lb
+++ b/src/mainboard/televideo/tc7020/Options.lb
@@ -70,8 +70,6 @@ default CONFIG_GX1_VIDEO = 1
 default CONFIG_GX1_VIDEOMODE = 0
 default CONFIG_SPLASH_GRAPHIC = 1
 default CONFIG_VIDEO_MB = 2
-default CONFIG_HAVE_PIRQ_TABLE=0
-default CONFIG_PIRQ_ROUTE=1
 
 default CONFIG_ROM_SIZE = 256 * 1024
 default CONFIG_MAINBOARD_VENDOR = "TeleVideo"
@@ -82,6 +80,7 @@ default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_PIRQ_TABLE = 1
+default CONFIG_PIRQ_ROUTE=1
 default CONFIG_IRQ_SLOT_COUNT = 3      # Soldered NIC, internal USB, mini PCI slot
 default CONFIG_HAVE_OPTION_TABLE = 0
 default CONFIG_ROM_IMAGE_SIZE = 64 * 1024

diff --git a/src/mainboard/via/epia-m700/Options.lb b/src/mainboard/via/epia-m700/Options.lb
index d3e5d6d504fe5ec50aaffe964d708e0cb5c5e316..f88cd928f7130add2d358bff5444469641c0dda1 100644 (file)
--- a/src/mainboard/via/epia-m700/Options.lb
+++ b/src/mainboard/via/epia-m700/Options.lb
@@ -116,6 +116,7 @@ default CONFIG_HAVE_MP_TABLE = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
 default CONFIG_HAVE_HARD_RESET = 0
+# TODO: There is an irq_tables.c file, should it be used?
 default CONFIG_HAVE_PIRQ_TABLE = 0
 default CONFIG_IRQ_SLOT_COUNT = 13
 default CONFIG_HAVE_ACPI_TABLES = 1

diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig
index 03d4649ac5489e774b4c0fed2c5957ac82ff8f28..48f8f4310c4c32d0641e6e5110a07ec5ee5b902a 100644 (file)
--- a/src/southbridge/intel/i82371eb/Kconfig
+++ b/src/southbridge/intel/i82371eb/Kconfig
@@ -1,3 +1,4 @@
 config SOUTHBRIDGE_INTEL_I82371EB
        bool
+       default n
 

diff --git a/src/superio/fintek/Kconfig b/src/superio/fintek/Kconfig
index 540e18e44ef4ecb9c1c6c9414a9959b96334b5be..75d78cb84166a670a037c224bd7c2ebeeaf2680b 100644 (file)
--- a/src/superio/fintek/Kconfig
+++ b/src/superio/fintek/Kconfig
@@ -1,2 +1,3 @@
 config SUPERIO_FINTEK_F71805F
        bool
+       default n

diff --git a/src/superio/intel/Kconfig b/src/superio/intel/Kconfig
index a7aca7d35d7f2e91346ad26228bbf437fec1874a..1df4f2e68c652c7fcd9b24d03c156764d542fa9f 100644 (file)
--- a/src/superio/intel/Kconfig
+++ b/src/superio/intel/Kconfig
@@ -1,2 +1,3 @@
 config SUPERIO_INTEL_I3100
        bool
+       default n

diff --git a/src/superio/ite/Kconfig b/src/superio/ite/Kconfig
index 066498149b694e3767eeb18ce328d9b43cb17ae1..609b4b604f5d5023ca97cf84620ef4c08a0b25ca 100644 (file)
--- a/src/superio/ite/Kconfig
+++ b/src/superio/ite/Kconfig
@@ -1,14 +1,21 @@
 config SUPERIO_ITE_IT8661F
        bool
+       default n
 config SUPERIO_ITE_IT8671F
        bool
+       default n
 config SUPERIO_ITE_IT8673F
        bool
+       default n
 config SUPERIO_ITE_IT8705F
        bool
+       default n
 config SUPERIO_ITE_IT8712F
        bool
+       default n
 config SUPERIO_ITE_IT8716F
        bool
+       default n
 config SUPERIO_ITE_IT8718F
        bool
+       default n

diff --git a/src/superio/nsc/Kconfig b/src/superio/nsc/Kconfig
index 68a1df80865213b3e89c48259b95fcd523e86bb3..5a398809fce57c7cdeaac4093b948a743593dd52 100644 (file)
--- a/src/superio/nsc/Kconfig
+++ b/src/superio/nsc/Kconfig
@@ -1,18 +1,27 @@
 config SUPERIO_NSC_PC8374
        bool
+       default n
 config SUPERIO_NSC_PC87309
        bool
+       default n
 config SUPERIO_NSC_PC87351
        bool
+       default n
 config SUPERIO_NSC_PC87360
        bool
+       default n
 config SUPERIO_NSC_PC87366
        bool
+       default n
 config SUPERIO_NSC_PC87417
        bool
+       default n
 config SUPERIO_NSC_PC87427
        bool
+       default n
 config SUPERIO_NSC_PC97307
        bool
+       default n
 config SUPERIO_NSC_PC97317
        bool
+       default n

diff --git a/src/superio/serverengines/Kconfig b/src/superio/serverengines/Kconfig
index dfb803f9922aebf561546aaf447da123b46a94fd..ad51a40cfc7f54203c88eb8c4dc441fb775b3af4 100644 (file)
--- a/src/superio/serverengines/Kconfig
+++ b/src/superio/serverengines/Kconfig
@@ -1,2 +1,3 @@
 config SUPERIO_SERVERENGINES_PILOT
        bool
+       default n

diff --git a/src/superio/smsc/Kconfig b/src/superio/smsc/Kconfig
index ac7b0dabc110b9dbe12fd9ed53e66d9efbf6c82a..6c1259bb13e6f016d769d1c341af6535c4310f95 100644 (file)
--- a/src/superio/smsc/Kconfig
+++ b/src/superio/smsc/Kconfig
@@ -1,12 +1,18 @@
 config SUPERIO_SMSC_FDC37M60X
        bool
+       default n
 config SUPERIO_SMSC_LPC47B272
        bool
+       default n
 config SUPERIO_SMSC_LPC47B397
        bool
+       default n
 config SUPERIO_SMSC_LPC47M10X
        bool
+       default n
 config SUPERIO_SMSC_LPC47N217
        bool
+       default n
 config SUPERIO_SMSC_SMSCSUPERIO
        bool
+       default n

diff --git a/src/superio/via/Kconfig b/src/superio/via/Kconfig
index 36b7f472cbe342ee889a359097af774a493e8c14..1a20f0725a9ff38b9d78d758934d92e91ca91fcf 100644 (file)
--- a/src/superio/via/Kconfig
+++ b/src/superio/via/Kconfig
@@ -1,2 +1,3 @@
 config SUPERIO_VIA_VT1211
        bool
+       default n

diff --git a/src/superio/winbond/Kconfig b/src/superio/winbond/Kconfig
index 63168cfa29d63f028c16c593b37d875b66c181d3..0d052052bb1f430aa7a2c49e2c568f77a2227d89 100644 (file)
--- a/src/superio/winbond/Kconfig
+++ b/src/superio/winbond/Kconfig
@@ -1,18 +1,27 @@
 config SUPERIO_WINBOND_W83627DHG
        bool
+       default n
 config SUPERIO_WINBOND_W83627EHG
        bool
+       default n
 config SUPERIO_WINBOND_W83627HF
        bool
+       default n
 config SUPERIO_WINBOND_W83627THF
        bool
+       default n
 config SUPERIO_WINBOND_W83627THG
        bool
+       default n
 config SUPERIO_WINBOND_W83627UHG
        bool
+       default n
 config SUPERIO_WINBOND_W83697HF
        bool
+       default n
 config SUPERIO_WINBOND_W83977F
        bool
+       default n
 config SUPERIO_WINBOND_W83977TF
        bool
+       default n