Patchwork more Kconfig selects

login
register
about
Submitter Myles Watson
Date 2009-10-20 15:19:37
Message ID <2831fecf0910200819i5f3bc455qd68ecfc4c3890bc7@mail.gmail.com>
Download mbox | patch
Permalink /patch/442/
State Accepted
Headers show

Comments

Myles Watson - 2009-10-20 15:19:37
I compared the config variables that we select with the list that we define.

I removed CONFIG_CPU_AMD_FAM10 & CONFIG_CPU_AMDK8 from mainboards.  They
should be selected in sockets, and they aren't used yet.

I added a couple of variables to src/Kconfig for lack of a better place so
that their selects would work.
I added select statements according to newconfig for some variables that
were defined but never selected in mainboard configs.

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

Thanks,
Myles
Uwe Hermann - 2009-10-20 15:42:13
On Tue, Oct 20, 2009 at 09:19:37AM -0600, Myles Watson wrote:
> I compared the config variables that we select with the list that we define.
> 
> I removed CONFIG_CPU_AMD_FAM10 & CONFIG_CPU_AMDK8 from mainboards.  They
> should be selected in sockets, and they aren't used yet.
> 
> I added a couple of variables to src/Kconfig for lack of a better place so
> that their selects would work.
> I added select statements according to newconfig for some variables that
> were defined but never selected in mainboard configs.
> 
> Signed-off-by: Myles Watson <mylesgw@gmail.com>

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

But see below for material for discussions and/or a followup patch.


> Index: svn/src/mainboard/asus/m2v-mx_se/Kconfig
> ===================================================================
> --- svn.orig/src/mainboard/asus/m2v-mx_se/Kconfig
> +++ svn/src/mainboard/asus/m2v-mx_se/Kconfig
> @@ -21,7 +21,6 @@
>  config BOARD_ASUS_M2V_MX_SE
>  	bool "M2V-MX SE"
>  	select ARCH_X86
> -	select CPU_AMD_K8
>  	select CPU_AMD_SOCKET_AM2
>  	select NORTHBRIDGE_AMD_AMDK8
>  	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
> @@ -35,6 +34,7 @@ config BOARD_ASUS_M2V_MX_SE
>  	select HAVE_OPTION_TABLE
>  	select HAVE_ACPI_TABLES
>  	select BOARD_ROMSIZE_KB_512
> +	select VGA

All CONFIG_VGA occurences:

config/Options.lb:define CONFIG_VGA

OK


include/pc80/vga.h:#if (CONFIG_VGA == 1)
include/pc80/vga.h:#endif /* (CONFIG_VGA == 1) */

These should probably be changed to
  #if CONFIG_VGA


mainboard/intel/eagleheights/Options.lb:uses CONFIG_VGA
mainboard/intel/eagleheights/Options.lb:#default CONFIG_VGA=0

Unused here, so can be dropped from Options.lb?


mainboard/asus/m2v-mx_se/Options.lb:uses CONFIG_VGA
mainboard/asus/m2v-mx_se/Options.lb:default CONFIG_VGA = 1

OK.


pc80/vga/Makefile.inc:obj-$(CONFIG_VGA) += vga.o
pc80/vga/Config.lb:uses CONFIG_VGA
pc80/vga/Config.lb:if CONFIG_VGA

OK.


southbridge/via/k8t890/k8m890_chrome.c:#if CONFIG_VGA == 1
southbridge/via/k8t890/k8m890_chrome.c:#if CONFIG_VGA == 1

These should probably be changed to
  #if CONFIG_VGA


> Index: svn/src/mainboard/emulation/qemu-x86/Kconfig
> ===================================================================
> --- svn.orig/src/mainboard/emulation/qemu-x86/Kconfig
> +++ svn/src/mainboard/emulation/qemu-x86/Kconfig
> @@ -1,7 +1,6 @@
>  config BOARD_EMULATION_QEMU_X86
>  	bool "QEMU x86"
>  	select ARCH_X86
> -	select CPU_I586
>  	select SOUTHBRIDGE_INTEL_I82371EB
>  	select CPU_EMULATION_QEMU_X86
>  	select HAVE_PIRQ_TABLE

Yep, I think this is a remainder from v3.


> Index: svn/src/mainboard/intel/jarrell/Kconfig
> ===================================================================
> --- svn.orig/src/mainboard/intel/jarrell/Kconfig
> +++ svn/src/mainboard/intel/jarrell/Kconfig
> @@ -9,6 +9,7 @@ config BOARD_INTEL_JARRELL
>  	select HAVE_PIRQ_TABLE
>  	select HAVE_MP_TABLE
>  	select UDELAY_TSC
> +	select USE_WATCHDOG_ON_BOOT
>  	select ATI_RAGE_XL
>  	select BOARD_ROMSIZE_KB_2048

There are the following occurences:

config/Options.lb:define CONFIG_USE_WATCHDOG_ON_BOOT

  The comment says "Use the watchdog on booting" which is not really
  descriptive. What does "use" mean here? Disable it? We should fix
  the comment I guess (and the resp. Kconfig help text).

include/part/watchdog.h:#if CONFIG_USE_WATCHDOG_ON_BOOT == 1
Kconfig:config USE_WATCHDOG_ON_BOOT

mainboard/kontron/986lcd-m/Options.lb:uses CONFIG_USE_WATCHDOG_ON_BOOT
mainboard/kontron/986lcd-m/Options.lb:default CONFIG_USE_WATCHDOG_ON_BOOT=0
mainboard/intel/eagleheights/Options.lb:uses CONFIG_USE_WATCHDOG_ON_BOOT
mainboard/intel/eagleheights/Options.lb:default CONFIG_USE_WATCHDOG_ON_BOOT=0

These two can drop the variable completely I assume, as they don't use it?


mainboard/intel/jarrell/Options.lb:uses CONFIG_USE_WATCHDOG_ON_BOOT
mainboard/intel/jarrell/Options.lb:default CONFIG_USE_WATCHDOG_ON_BOOT=1

This is fixed by your change above.


mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c:#if !CONFIG_USE_WATCHDOG_ON_BOOT
mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c:#if !CONFIG_USE_WATCHDOG_ON_BOOT

Not sure about these two. They use the variable but never add a "uses"
line in Option.lb?


Uwe.
Myles Watson - 2009-10-20 16:16:10
On Tue, Oct 20, 2009 at 9:42 AM, Uwe Hermann <uwe@hermann-uwe.de> wrote:

> On Tue, Oct 20, 2009 at 09:19:37AM -0600, Myles Watson wrote:
> > I compared the config variables that we select with the list that we
> define.
> >
> > I removed CONFIG_CPU_AMD_FAM10 & CONFIG_CPU_AMDK8 from mainboards.  They
> > should be selected in sockets, and they aren't used yet.
> >
> > I added a couple of variables to src/Kconfig for lack of a better place
> so
> > that their selects would work.
> > I added select statements according to newconfig for some variables that
> > were defined but never selected in mainboard configs.
> >
> > Signed-off-by: Myles Watson <mylesgw@gmail.com>
>
> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
>
Thanks for the detailed review.  Rev 4816.


> But see below for material for discussions and/or a followup patch.
>


> include/pc80/vga.h:#if (CONFIG_VGA == 1)
> include/pc80/vga.h:#endif /* (CONFIG_VGA == 1) */
>
> These should probably be changed to
>  #if CONFIG_VGA
>
Fixed

mainboard/intel/eagleheights/Options.lb:uses CONFIG_VGA
> mainboard/intel/eagleheights/Options.lb:#default CONFIG_VGA=0
>
> Unused here, so can be dropped from Options.lb?
>
Could be, but I'm trying not to touch newconfig.  It should be killed sooner
rather than later, and it won't help our comparisons if we modify it.


> These should probably be changed to
>  #if CONFIG_VGA
>
This variable should probably be something more specific, since only one
board uses it, but I don't know enough about it to rename it.


> config/Options.lb:define CONFIG_USE_WATCHDOG_ON_BOOT
>
>  The comment says "Use the watchdog on booting" which is not really
>  descriptive. What does "use" mean here? Disable it? We should fix
>  the comment I guess (and the resp. Kconfig help text).
>
I expect that it means enable it, but I don't know.  Again I was just trying
to match newconfig.

mainboard/lippert/spacerunner-lx/cache_as_ram_auto.c:#if
> !CONFIG_USE_WATCHDOG_ON_BOOT
> mainboard/lippert/roadrunner-lx/cache_as_ram_auto.c:#if
> !CONFIG_USE_WATCHDOG_ON_BOOT
>
> Not sure about these two. They use the variable but never add a "uses"
> line in Option.lb?
>
You don't have to have a uses line in Options.lb to reference a CONFIG
variable in the code.  If you try to set its value it will break, but
testing its value in C works fine (or generates a warning if it isn't always
exported.)

Thanks,
Myles

Patch

Index: svn/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ svn/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_AMD_SERENGETI_CHEETAH_FAM10
 	bool "Serengeti Cheetah (Fam10)"
 	select ARCH_X86
-	select CPU_AMD_FAM10
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
Index: svn/src/mainboard/supermicro/h8dmr_fam10/Kconfig
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ svn/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_SUPERMICRO_H8DMR_FAM10
 	bool "H8DMR_FAM10 (Fam10)"
 	select ARCH_X86
-	select CPU_AMD_FAM10
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_SUPERMICRO_H8DMR_FAM10
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select AMDMCT
 	select BOARD_ROMSIZE_KB_1024
 
Index: svn/src/mainboard/tyan/s2912_fam10/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/Kconfig
+++ svn/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2912_FAM10
 	bool "S2912_FAM10"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_TYAN_S2912_FAM10
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select BOARD_ROMSIZE_KB_1024
 	select ENABLE_APIC_EXT_ID
Index: svn/src/Kconfig
===================================================================
--- svn.orig/src/Kconfig
+++ svn/src/Kconfig
@@ -448,3 +448,7 @@  config USE_INIT
 config ENABLE_APIC_EXT_ID
 	bool
 	default n
+
+config LIFT_BSP_APIC_ID
+	bool
+	default n
Index: svn/src/mainboard/amd/dbm690t/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/Kconfig
+++ svn/src/mainboard/amd/dbm690t/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_AMD_DBM690T
 	bool "DBM690T"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/amd/pistachio/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/Kconfig
+++ svn/src/mainboard/amd/pistachio/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_AMD_PISTACHIO
 	bool "Pistachio"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ svn/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_AMD_SERENGETI_CHEETAH
 	bool "Serengeti Cheetah"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@  config BOARD_AMD_SERENGETI_CHEETAH
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select AP_CODE_IN_CAR
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
Index: svn/src/mainboard/arima/hdama/Kconfig
===================================================================
--- svn.orig/src/mainboard/arima/hdama/Kconfig
+++ svn/src/mainboard/arima/hdama/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_ARIMA_HDAMA
 	bool "HDAMA"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/asus/a8n_e/Kconfig
===================================================================
--- svn.orig/src/mainboard/asus/a8n_e/Kconfig
+++ svn/src/mainboard/asus/a8n_e/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_ASUS_A8N_E
 	bool "A8N-E"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_939
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/asus/a8v-e_se/Kconfig
===================================================================
--- svn.orig/src/mainboard/asus/a8v-e_se/Kconfig
+++ svn/src/mainboard/asus/a8v-e_se/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_ASUS_A8V_E_SE
 	bool "A8V-E SE"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_939
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/asus/m2v-mx_se/Kconfig
===================================================================
--- svn.orig/src/mainboard/asus/m2v-mx_se/Kconfig
+++ svn/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -21,7 +21,6 @@ 
 config BOARD_ASUS_M2V_MX_SE
 	bool "M2V-MX SE"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -35,6 +34,7 @@  config BOARD_ASUS_M2V_MX_SE
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_512
+	select VGA
 
 config MAINBOARD_DIR
 	string
Index: svn/src/mainboard/broadcom/blast/Kconfig
===================================================================
--- svn.orig/src/mainboard/broadcom/blast/Kconfig
+++ svn/src/mainboard/broadcom/blast/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_BROADCOM_BLAST
 	bool "Blast"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/emulation/qemu-x86/Kconfig
===================================================================
--- svn.orig/src/mainboard/emulation/qemu-x86/Kconfig
+++ svn/src/mainboard/emulation/qemu-x86/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_EMULATION_QEMU_X86
 	bool "QEMU x86"
 	select ARCH_X86
-	select CPU_I586
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select CPU_EMULATION_QEMU_X86
 	select HAVE_PIRQ_TABLE
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_GIGABYTE_GA_2761GXDK
 	bool "GA-2761GXDK"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -12,6 +11,7 @@  config BOARD_GIGABYTE_GA_2761GXDK
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
Index: svn/src/mainboard/gigabyte/m57sli/Kconfig
===================================================================
--- svn.orig/src/mainboard/gigabyte/m57sli/Kconfig
+++ svn/src/mainboard/gigabyte/m57sli/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_GIGABYTE_M57SLI
 	bool "M57SLI"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@  config BOARD_GIGABYTE_M57SLI
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select HAVE_ACPI_TABLES
 	select K8_REV_F_SUPPORT
Index: svn/src/mainboard/hp/dl145_g3/Kconfig
===================================================================
--- svn.orig/src/mainboard/hp/dl145_g3/Kconfig
+++ svn/src/mainboard/hp/dl145_g3/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_HP_DL145_G3
 	bool "DL145-G3"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@  config BOARD_HP_DL145_G3
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: svn/src/mainboard/ibm/e325/Kconfig
===================================================================
--- svn.orig/src/mainboard/ibm/e325/Kconfig
+++ svn/src/mainboard/ibm/e325/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_IBM_E325
 	bool "e325"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/ibm/e326/Kconfig
===================================================================
--- svn.orig/src/mainboard/ibm/e326/Kconfig
+++ svn/src/mainboard/ibm/e326/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_IBM_E326
 	bool "e326"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/iwill/dk8_htx/Kconfig
===================================================================
--- svn.orig/src/mainboard/iwill/dk8_htx/Kconfig
+++ svn/src/mainboard/iwill/dk8_htx/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_IWILL_DK8_HTX
 	bool "DK8-HTX"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@  config BOARD_IWILL_DK8_HTX
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select WAIT_BEFORE_CPUS_INIT
 	select HAVE_ACPI_TABLES
Index: svn/src/mainboard/iwill/dk8s2/Kconfig
===================================================================
--- svn.orig/src/mainboard/iwill/dk8s2/Kconfig
+++ svn/src/mainboard/iwill/dk8s2/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_IWILL_DK8S2
 	bool "DK8S2"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/iwill/dk8x/Kconfig
===================================================================
--- svn.orig/src/mainboard/iwill/dk8x/Kconfig
+++ svn/src/mainboard/iwill/dk8x/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_IWILL_DK8X
 	bool "DK8X"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/kontron/986lcd-m/Kconfig
===================================================================
--- svn.orig/src/mainboard/kontron/986lcd-m/Kconfig
+++ svn/src/mainboard/kontron/986lcd-m/Kconfig
@@ -11,7 +11,9 @@  config BOARD_KONTRON_986LCD_M
 	select MMCONF_SUPPORT
 	select USE_PRINTK_IN_CAR
 	select AP_IN_SIPI_WAIT
+	select UDELAY_LAPIC
 	select HAVE_ACPI_TABLES
+	select HAVE_SMI_HANDLER
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
Index: svn/src/mainboard/kontron/kt690/Kconfig
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/Kconfig
+++ svn/src/mainboard/kontron/kt690/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_KONTRON_KT690
 	bool "KT690"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/msi/ms7135/Kconfig
===================================================================
--- svn.orig/src/mainboard/msi/ms7135/Kconfig
+++ svn/src/mainboard/msi/ms7135/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_MSI_MS7135
 	bool "MS7135"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_754
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/msi/ms7260/Kconfig
===================================================================
--- svn.orig/src/mainboard/msi/ms7260/Kconfig
+++ svn/src/mainboard/msi/ms7260/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_MSI_MS7260
 	bool "MS7260"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_AM2
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_MSI_MS7260
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
Index: svn/src/mainboard/msi/ms9185/Kconfig
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/Kconfig
+++ svn/src/mainboard/msi/ms9185/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_MSI_MS9185
 	bool "MS9185"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -15,6 +14,7 @@  config BOARD_MSI_MS9185
 	select HAVE_HARD_RESET
 	select HAVE_ACPI_TABLES
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: svn/src/mainboard/msi/ms9282/Kconfig
===================================================================
--- svn.orig/src/mainboard/msi/ms9282/Kconfig
+++ svn/src/mainboard/msi/ms9282/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_MSI_MS9282
 	bool "MS9282"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/newisys/khepri/Kconfig
===================================================================
--- svn.orig/src/mainboard/newisys/khepri/Kconfig
+++ svn/src/mainboard/newisys/khepri/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_NEWISYS_KHEPRI
 	bool "Khepri"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/nvidia/l1_2pvv/Kconfig
===================================================================
--- svn.orig/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ svn/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_NVIDIA_L1_2PVV
 	bool "L1 2PVV"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_NVIDIA_L1_2PVV
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
Index: svn/src/mainboard/sunw/ultra40/Kconfig
===================================================================
--- svn.orig/src/mainboard/sunw/ultra40/Kconfig
+++ svn/src/mainboard/sunw/ultra40/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_SUNW_ULTRA40
 	bool "Ultra 40"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/supermicro/h8dme/Kconfig
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/Kconfig
+++ svn/src/mainboard/supermicro/h8dme/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_SUPERMICRO_H8DME
 	bool "H8DME"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -14,6 +13,7 @@  config BOARD_SUPERMICRO_H8DME
 	select HAVE_HARD_RESET
 	select AP_CODE_IN_CAR
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_1024
 
 config MAINBOARD_DIR
Index: svn/src/mainboard/supermicro/h8dmr/Kconfig
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/Kconfig
+++ svn/src/mainboard/supermicro/h8dmr/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_SUPERMICRO_H8DMR
 	bool "H8DMR"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_SUPERMICRO_H8DMR
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select BOARD_ROMSIZE_KB_512
 
 config MAINBOARD_DIR
Index: svn/src/mainboard/technexion/tim5690/Kconfig
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/Kconfig
+++ svn/src/mainboard/technexion/tim5690/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TECHNEXION_TIM5690
 	bool "Tim5690"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/technexion/tim8690/Kconfig
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/Kconfig
+++ svn/src/mainboard/technexion/tim8690/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TECHNEXION_TIM8690
 	bool "Tim8690"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2850/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2850/Kconfig
+++ svn/src/mainboard/tyan/s2850/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2850
 	bool "Tomcat K8S (S2850)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2875/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2875/Kconfig
+++ svn/src/mainboard/tyan/s2875/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2875
 	bool "Tiger K8W (S2875)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2880/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2880/Kconfig
+++ svn/src/mainboard/tyan/s2880/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2880
 	bool "Thunder K8SR (S2880)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2881/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2881/Kconfig
+++ svn/src/mainboard/tyan/s2881/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2881
 	bool "Thunder K8SR (S2881)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2882/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2882/Kconfig
+++ svn/src/mainboard/tyan/s2882/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2882
 	bool "Thunder K8SR (S2882)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2885/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2885/Kconfig
+++ svn/src/mainboard/tyan/s2885/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2885
 	bool "Thunder K8SR (S2885)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2891/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/Kconfig
+++ svn/src/mainboard/tyan/s2891/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2891
 	bool "Thunder K8SRE (S2891)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2892/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2892/Kconfig
+++ svn/src/mainboard/tyan/s2892/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2892
 	bool "Thunder K8SE (S2892)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2895/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2895/Kconfig
+++ svn/src/mainboard/tyan/s2895/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2895
 	bool "Thunder K8WE (S2895)"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s2912/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s2912/Kconfig
+++ svn/src/mainboard/tyan/s2912/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S2912
 	bool "S2912"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_F
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
@@ -13,6 +12,7 @@  config BOARD_TYAN_S2912
 	select USE_DCACHE_RAM
 	select HAVE_HARD_RESET
 	select IOAPIC
+	select LIFT_BSP_APIC_ID
 	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	select K8_REV_F_SUPPORT
 	select BOARD_ROMSIZE_KB_512
Index: svn/src/mainboard/tyan/s4880/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s4880/Kconfig
+++ svn/src/mainboard/tyan/s4880/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S4880
 	bool "S4880"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/tyan/s4882/Kconfig
===================================================================
--- svn.orig/src/mainboard/tyan/s4882/Kconfig
+++ svn/src/mainboard/tyan/s4882/Kconfig
@@ -1,7 +1,6 @@ 
 config BOARD_TYAN_S4882
 	bool "S4882"
 	select ARCH_X86
-	select CPU_AMD_K8
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
Index: svn/src/mainboard/intel/jarrell/Kconfig
===================================================================
--- svn.orig/src/mainboard/intel/jarrell/Kconfig
+++ svn/src/mainboard/intel/jarrell/Kconfig
@@ -9,6 +9,7 @@  config BOARD_INTEL_JARRELL
 	select HAVE_PIRQ_TABLE
 	select HAVE_MP_TABLE
 	select UDELAY_TSC
+	select USE_WATCHDOG_ON_BOOT
 	select ATI_RAGE_XL
 	select BOARD_ROMSIZE_KB_2048