Patchwork More kconfig fixes

login
register
about
Submitter Uwe Hermann
Date 2009-10-08 14:59:52
Message ID <20091008145952.GY15511@greenwood>
Download mbox | patch
Permalink /patch/370/
State Accepted
Headers show

Comments

Uwe Hermann - 2009-10-08 14:59:52
See patch.


Uwe.
Myles Watson - 2009-10-08 15:07:40
> - Set CONFIG_PIRQ_ROUTE=1 for boards which have an irq_tables.c but
>    for some reason had CONFIG_PIRQ_ROUTE=0.
>    For EPIA-M700 I'm not sure it should be used at all, as this board has
>    ACPI tables (?)
I don't think we should do this, unless it's been boot tested.  If the
default was not to use it with newconfig, it could be broken.  Right now
we're trying to match newconfig.

The other parts:
Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Uwe Hermann - 2009-10-09 12:22:03
On Thu, Oct 08, 2009 at 09:07:40AM -0600, Myles Watson wrote:
> > - Set CONFIG_PIRQ_ROUTE=1 for boards which have an irq_tables.c but
> >    for some reason had CONFIG_PIRQ_ROUTE=0.
> >    For EPIA-M700 I'm not sure it should be used at all, as this board has
> >    ACPI tables (?)
> I don't think we should do this, unless it's been boot tested.  If the
> default was not to use it with newconfig, it could be broken.  Right now
> we're trying to match newconfig.

Yep, converted to TODO comments for now (Except for one board which
actually set the variable first to 0, then to 1 in the same file, where
I assume the second overrides the first).


> Acked-by: Myles Watson <mylesgw@gmail.com>

Thanks, r4749.


Uwe.

Patch

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.

 - Set CONFIG_PIRQ_ROUTE=1 for boards which have an irq_tables.c but
   for some reason had CONFIG_PIRQ_ROUTE=0.
   For EPIA-M700 I'm not sure it should be used at all, as this board has
   ACPI tables (?)
 
 - 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>

Index: southbridge/intel/i82371eb/Kconfig
===================================================================
--- southbridge/intel/i82371eb/Kconfig	(Revision 4742)
+++ southbridge/intel/i82371eb/Kconfig	(Arbeitskopie)
@@ -1,3 +1,4 @@ 
 config SOUTHBRIDGE_INTEL_I82371EB
 	bool
+	default n
 
Index: Kconfig
===================================================================
--- Kconfig	(Revision 4742)
+++ Kconfig	(Arbeitskopie)
@@ -56,11 +56,11 @@ 
 
 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 AGP_APERTURE_SIZE
 	hex
-	default 0
+	default 0x0
 
 config XIP_ROM_BASE
 	hex
@@ -174,7 +174,7 @@ 
 
 config HAVE_HARD_RESET
 	bool
-	default 0
+	default n
 
 config HAVE_INIT_TIMER
 	bool
Index: superio/serverengines/Kconfig
===================================================================
--- superio/serverengines/Kconfig	(Revision 4742)
+++ superio/serverengines/Kconfig	(Arbeitskopie)
@@ -1,2 +1,3 @@ 
 config SUPERIO_SERVERENGINES_PILOT
 	bool
+	default n
Index: superio/via/Kconfig
===================================================================
--- superio/via/Kconfig	(Revision 4742)
+++ superio/via/Kconfig	(Arbeitskopie)
@@ -1,2 +1,3 @@ 
 config SUPERIO_VIA_VT1211
 	bool
+	default n
Index: superio/fintek/Kconfig
===================================================================
--- superio/fintek/Kconfig	(Revision 4742)
+++ superio/fintek/Kconfig	(Arbeitskopie)
@@ -1,2 +1,3 @@ 
 config SUPERIO_FINTEK_F71805F
 	bool
+	default n
Index: superio/winbond/Kconfig
===================================================================
--- superio/winbond/Kconfig	(Revision 4742)
+++ superio/winbond/Kconfig	(Arbeitskopie)
@@ -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
Index: superio/ite/Kconfig
===================================================================
--- superio/ite/Kconfig	(Revision 4742)
+++ superio/ite/Kconfig	(Arbeitskopie)
@@ -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
Index: superio/nsc/Kconfig
===================================================================
--- superio/nsc/Kconfig	(Revision 4742)
+++ superio/nsc/Kconfig	(Arbeitskopie)
@@ -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
Index: superio/smsc/Kconfig
===================================================================
--- superio/smsc/Kconfig	(Revision 4742)
+++ superio/smsc/Kconfig	(Arbeitskopie)
@@ -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
Index: superio/intel/Kconfig
===================================================================
--- superio/intel/Kconfig	(Revision 4742)
+++ superio/intel/Kconfig	(Arbeitskopie)
@@ -1,2 +1,3 @@ 
 config SUPERIO_INTEL_I3100
 	bool
+	default n
Index: cpu/Kconfig
===================================================================
--- cpu/Kconfig	(Revision 4742)
+++ cpu/Kconfig	(Arbeitskopie)
@@ -19,7 +19,7 @@ 
 
 config DCACHE_RAM_GLOBAL_VAR_SIZE
 	hex
-	default 0
+	default 0x0
 
 config MAX_PHYSICAL_CPUS
 	int
Index: cpu/amd/socket_F_1207/Kconfig
===================================================================
--- cpu/amd/socket_F_1207/Kconfig	(Revision 4742)
+++ cpu/amd/socket_F_1207/Kconfig	(Arbeitskopie)
@@ -41,5 +41,5 @@ 
 
 config CDB
 	hex
-	default 0
+	default 0x0
 	depends on CPU_AMD_SOCKET_F_1207
Index: mainboard/televideo/tc7020/Options.lb
===================================================================
--- mainboard/televideo/tc7020/Options.lb	(Revision 4742)
+++ mainboard/televideo/tc7020/Options.lb	(Arbeitskopie)
@@ -70,8 +70,6 @@ 
 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"
@@ -81,7 +79,9 @@ 
 default CONFIG_HAVE_HARD_RESET = 0
 default CONFIG_UDELAY_TSC = 1
 default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1
+# TODO: There's an irq_tables.c file, but CONFIG_HAVE_PIRQ_TABLE was 0?
 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
Index: mainboard/iei/juki-511p/Options.lb
===================================================================
--- mainboard/iei/juki-511p/Options.lb	(Revision 4742)
+++ mainboard/iei/juki-511p/Options.lb	(Arbeitskopie)
@@ -69,10 +69,10 @@ 
 ##
 ## Build code to export a programmable irq routing table
 ##
-default CONFIG_HAVE_PIRQ_TABLE=0
+# TODO: There's an irq_tables.c file, but ONFIG_HAVE_PIRQ_TABLE was 0?
+default CONFIG_HAVE_PIRQ_TABLE=1
 default CONFIG_IRQ_SLOT_COUNT=2
 default CONFIG_PIRQ_ROUTE=1
-#object irq_tables.o
 
 ##
 ## Build code to export a CMOS option table
Index: mainboard/via/epia-m700/Options.lb
===================================================================
--- mainboard/via/epia-m700/Options.lb	(Revision 4742)
+++ mainboard/via/epia-m700/Options.lb	(Arbeitskopie)
@@ -116,6 +116,7 @@ 
 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
Index: mainboard/asus/m2v-mx_se/Kconfig
===================================================================
--- mainboard/asus/m2v-mx_se/Kconfig	(Revision 4742)
+++ mainboard/asus/m2v-mx_se/Kconfig	(Arbeitskopie)
@@ -115,8 +115,3 @@ 
 	default 0x20
 	depends on BOARD_ASUS_M2V_MX_SE
 
-# FIXME?
-config IRQ_SLOT_COUNT
-	int
-	default 11
-	depends on BOARD_ASUS_M2V_MX_SE
Index: arch/i386/Kconfig
===================================================================
--- arch/i386/Kconfig	(Revision 4742)
+++ arch/i386/Kconfig	(Arbeitskopie)
@@ -29,7 +29,7 @@ 
 
 config PAYLOAD_SIZE
 	hex
-	default 0
+	default 0x0
 
 config ROM_PAYLOAD_START
 	hex