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 <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4657 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index eefa9c2a7a8535e162f157ffdaac10f5d8919521..7cc96580035bcd10d6de84cd8067bfed6446a5d7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/config.py: $(yapps2_py) $(config_g)
 
 # 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))
 

diff --git a/src/Kconfig b/src/Kconfig
index f76a40d7c3df6633e8b4bfca124e164d3c949da4..d44fa403816127ce686e0ab8201792d2393f2400 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -84,14 +84,6 @@ config PCI_ROM_RUN
        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

diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig
index 1ec51318998b26f18b7eed2874b3953ee1eb98a5..4cf6eac654749967608ad1df3246a12dd8348cdc 100644 (file)
--- a/src/cpu/amd/socket_F/Kconfig
+++ b/src/cpu/amd/socket_F/Kconfig
@@ -24,8 +24,3 @@ config DIMM_SUPPORT
        default 0x0104
        depends on CPU_AMD_SOCKET_F
 
-config CPU_SOCKET_TYPE
-       hex
-       default 0x10
-       depends on CPU_AMD_SOCKET_F
-

diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index e73ee3cf9c7894533865e198721ab12a5b229c55..e43458af8fe1b72572828d622da5eb4751a88c1b 100644 (file)
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -79,20 +79,20 @@ config PCI_64BIT_PREF_MEM
 
 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

diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index dce3ce4b1d781a78b7288894fe697115a45a5c4a..c581945b0c9951422ff356df55a7c2233be51362 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -119,6 +119,11 @@ config HT_CHAIN_END_UNITID_BASE
        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

diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index e661c939f8b57a54470ae7e7698df3020911d741..2fc08b80c7d6916df11c1b27ea456bd658da4879 100644 (file)
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -17,7 +17,7 @@ config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
        hex
-       default 8
+       default 0x10
        depends on BOARD_TYAN_S2891
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@ config MAINBOARD_PART_NUMBER
        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

diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index 39d14514a40f3c4f15e972162b1e565a6d265446..00c489748914e54cea1598b92882ed546aba37d3 100644 (file)
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -17,7 +17,7 @@ config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
        hex
-       default 8
+       default 0x10
        depends on BOARD_TYAN_S2892
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@ config MAINBOARD_PART_NUMBER
        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

diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 3528b8c71a5a4863e07ce6b3c9170018450ae65f..331ae941d4c6c95a77300217905eb3587cbd7c13 100644 (file)
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -17,7 +17,7 @@ config MAINBOARD_DIR
 
 config APIC_ID_OFFSET
        hex
-       default 8
+       default 0x10
        depends on BOARD_TYAN_S2895
 
 config SB_HT_CHAIN_ON_BUS0
@@ -40,7 +40,7 @@ config MAINBOARD_PART_NUMBER
        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

diff --git a/src/southbridge/amd/amd8131/Makefile.inc b/src/southbridge/amd/amd8131/Makefile.inc
index b23e8953a44dc3b95cdbcb9c13c22d82d983dd15..6a3e5bcf53e187a5a25dde4864f96e331a89aaf6 100644 (file)
--- a/src/southbridge/amd/amd8131/Makefile.inc
+++ b/src/southbridge/amd/amd8131/Makefile.inc
@@ -1 +1 @@
-driver-$(SOUTHBRIDGE_AMD_AMD8131) += amd8131_bridge.o
\ No newline at end of file
+driver-y += amd8131_bridge.o