From 748475b800c552236aff16c1beffd55b70791ae6 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 9 Oct 2009 11:47:21 +0000 Subject: 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 Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4749 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 8 ++++---- src/arch/i386/Kconfig | 2 +- src/cpu/Kconfig | 2 +- src/cpu/amd/socket_F_1207/Kconfig | 2 +- src/mainboard/asus/m2v-mx_se/Kconfig | 5 ----- src/mainboard/iei/juki-511p/Options.lb | 2 +- src/mainboard/televideo/tc7020/Options.lb | 3 +-- src/mainboard/via/epia-m700/Options.lb | 1 + src/southbridge/intel/i82371eb/Kconfig | 1 + src/superio/fintek/Kconfig | 1 + src/superio/intel/Kconfig | 1 + src/superio/ite/Kconfig | 7 +++++++ src/superio/nsc/Kconfig | 9 +++++++++ src/superio/serverengines/Kconfig | 1 + src/superio/smsc/Kconfig | 6 ++++++ src/superio/via/Kconfig | 1 + src/superio/winbond/Kconfig | 9 +++++++++ 17 files changed, 46 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/Kconfig b/src/Kconfig index 6458037497..5ffc3563e5 100644 --- 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 8481cf6f06..64c96d7a64 100644 --- 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 ebe5dec07f..74198994bd 100644 --- 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 c5e1be495a..de64165a37 100644 --- 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 0a39eae9ce..f1ab0ffbc5 100644 --- 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 de0b1d2f21..16264f2754 100644 --- 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 85f2928fd1..683b19b2ab 100644 --- 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 d3e5d6d504..f88cd928f7 100644 --- 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 03d4649ac5..48f8f4310c 100644 --- 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 540e18e44e..75d78cb841 100644 --- 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 a7aca7d35d..1df4f2e68c 100644 --- 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 066498149b..609b4b604f 100644 --- 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 68a1df8086..5a398809fc 100644 --- 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 dfb803f992..ad51a40cfc 100644 --- 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 ac7b0dabc1..6c1259bb13 100644 --- 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 36b7f472cb..1a20f0725a 100644 --- 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 63168cfa29..0d052052bb 100644 --- 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 -- cgit v1.2.3