[v2] r4657 - in trunk/coreboot-v2: . src src/cpu/amd/socket_F src/devices src/mainboard/amd/serengeti_cheetah src/mainboard/tyan/s2891 src/mainboard/tyan/s2892 src/mainboard/tyan/s2895 src/southbridge/amd/amd8131

Author: myles
Date: 2009-09-22 23:29:32 +0200 (Tue, 22 Sep 2009)
New Revision: 4657

Modified:
   trunk/coreboot-v2/Makefile
   trunk/coreboot-v2/src/Kconfig
   trunk/coreboot-v2/src/cpu/amd/socket_F/Kconfig
   trunk/coreboot-v2/src/devices/Kconfig
   trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig
   trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig
   trunk/coreboot-v2/src/southbridge/amd/amd8131/Makefile.inc
Log:
src/Kconfig: Remove HT-specific options.
src/cpu/amd/socket_F/Kconfig: Remove second occurrence of CPU_SOCKET_TYPE.
src/mainboard/amd/serengeti_cheetah/Kconfig: Add HT_CHAIN_UNITID_BASE here, since it is board specific.
src/mainboard/tyan/s289X/Kconfig: Fix typo and change APIC_ID_OFFSET to match old config.
src/devices/Kconfig: Change default value of *_PLUGIN_SUPPORT to match old config.
src/southbridge/amd/amd8131/Makefile.inc: Remove check since it was a typo, and the correct variable is checked in the parent directory.
src/Makefile:Use devicetree.cb instead of Config.lb to generate static.c.

Signed-off-by: Myles Watson 
Acked-by: Ronald G. Minnich

Modified: trunk/coreboot-v2/Makefile
===================================================================
--- trunk/coreboot-v2/Makefile	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/Makefile	2009-09-22 21:29:32 UTC (rev 4657)
@@ -111,7 +111,7 @@

# needed objects that every mainboard uses 
 # Creation of these is architecture and mainboard independent
-$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/Config.lb  $(obj)/mainboard/$(MAINBOARDDIR)/config.py
+$(obj)/mainboard/$(MAINBOARDDIR)/static.c: $(src)/mainboard/$(MAINBOARDDIR)/devicetree.cb  $(obj)/mainboard/$(MAINBOARDDIR)/config.py
    mkdir -p $(obj)/mainboard/$(MAINBOARDDIR)
    (cd $(obj)/mainboard/$(MAINBOARDDIR) ; PYTHONPATH=$(top)/util/sconfig export PYTHONPATH; python config.py  $(MAINBOARDDIR) $(top) $(obj)/mainboard/$(MAINBOARDDIR))

Modified: trunk/coreboot-v2/src/Kconfig
===================================================================
--- trunk/coreboot-v2/src/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -84,14 +84,6 @@
    bool
    default n

-config HT_CHAIN_UNITID_BASE
-	hex
-	default 1
-
-config HT_CHAIN_END_UNITID_BASE
-	hex
-	default 0x20
-
 config HEAP_SIZE
    hex
    default 0x2000

Modified: trunk/coreboot-v2/src/cpu/amd/socket_F/Kconfig
===================================================================
--- trunk/coreboot-v2/src/cpu/amd/socket_F/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/cpu/amd/socket_F/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -24,8 +24,3 @@
    default 0x0104
    depends on CPU_AMD_SOCKET_F

-config CPU_SOCKET_TYPE
-	hex
-	default 0x10
-	depends on CPU_AMD_SOCKET_F
-

Modified: trunk/coreboot-v2/src/devices/Kconfig
===================================================================
--- trunk/coreboot-v2/src/devices/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/devices/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -79,20 +79,20 @@

config HYPERTRANSPORT_PLUGIN_SUPPORT
    bool
-	default n
+	default y

config PCIX_PLUGIN_SUPPORT
    bool
-	default n
+	default y

config PCIEXP_PLUGIN_SUPPORT
    bool
-	default n
+	default y

config AGP_PLUGIN_SUPPORT
    bool
-	default n
+	default y

config CARDBUS_PLUGIN_SUPPORT
    bool
-	default n
+	default y

Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -119,6 +119,11 @@
    default 0x6
    depends on BOARD_AMD_SERENGETI_CHEETAH

+config HT_CHAIN_UNITID_BASE
+	hex
+	default 0x1
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+
 config USE_INIT
    bool
    default n

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -17,7 +17,7 @@

config APIC_ID_OFFSET
    hex
-	default 8
+	default 0x10
    depends on BOARD_TYAN_S2891

config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@
    default "s2891"
    depends on BOARD_TYAN_S2891

-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
    hex
    default 0x2891
    depends on BOARD_TYAN_S2891

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -17,7 +17,7 @@

config APIC_ID_OFFSET
    hex
-	default 8
+	default 0x10
    depends on BOARD_TYAN_S2892

config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@
    default "s2892"
    depends on BOARD_TYAN_S2892

-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
    hex
    default 0x2892
    depends on BOARD_TYAN_S2892

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Kconfig	2009-09-22 21:29:32 UTC (rev 4657)
@@ -17,7 +17,7 @@

config APIC_ID_OFFSET
    hex
-	default 8
+	default 0x10
    depends on BOARD_TYAN_S2895

config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@
    default "s2895"
    depends on BOARD_TYAN_S2895

-config CONFIG_MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
+config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
    hex
    default 0x2895
    depends on BOARD_TYAN_S2895

Modified: trunk/coreboot-v2/src/southbridge/amd/amd8131/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/amd8131/Makefile.inc	2009-09-22 18:53:50 UTC (rev 4656)
+++ trunk/coreboot-v2/src/southbridge/amd/amd8131/Makefile.inc	2009-09-22 21:29:32 UTC (rev 4657)
@@ -1 +1 @@
-driver-$(SOUTHBRIDGE_AMD_AMD8131) += amd8131_bridge.o
\ No newline at end of file
+driver-y += amd8131_bridge.o