summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-09-22 21:29:32 +0000
committerMyles Watson <mylesgw@gmail.com>2009-09-22 21:29:32 +0000
commited03556fbf62c6150a2a9c6eb22e49e638262fbb (patch)
tree63103a929544cdf34ae6f1c17d18167ac0e3489d
parenta74ae635caeb0598fc1422356f13722c03262e8e (diff)
downloadcoreboot-ed03556fbf62c6150a2a9c6eb22e49e638262fbb.tar.xz
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
-rw-r--r--Makefile2
-rw-r--r--src/Kconfig8
-rw-r--r--src/cpu/amd/socket_F/Kconfig5
-rw-r--r--src/devices/Kconfig10
-rw-r--r--src/mainboard/amd/serengeti_cheetah/Kconfig5
-rw-r--r--src/mainboard/tyan/s2891/Kconfig4
-rw-r--r--src/mainboard/tyan/s2892/Kconfig4
-rw-r--r--src/mainboard/tyan/s2895/Kconfig4
-rw-r--r--src/southbridge/amd/amd8131/Makefile.inc2
9 files changed, 18 insertions, 26 deletions
diff --git a/Makefile b/Makefile
index eefa9c2a7a..7cc9658003 100644
--- 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 f76a40d7c3..d44fa40381 100644
--- 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 1ec5131899..4cf6eac654 100644
--- 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 e73ee3cf9c..e43458af8f 100644
--- 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 dce3ce4b1d..c581945b0c 100644
--- 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 e661c939f8..2fc08b80c7 100644
--- 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 39d14514a4..00c4897489 100644
--- 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 3528b8c71a..331ae941d4 100644
--- 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 b23e8953a4..6a3e5bcf53 100644
--- 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