Remove HyperTransport support from boards that don't need it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4670 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/Kconfig b/src/Kconfig
index 9f8862366a7f5a6d8c88a4bd9d181b88b3f59b5c..7d268b0f0de93c95e7c9c12004c61d8adfd375dd 100644 (file)
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -30,8 +30,8 @@ mainmenu "Coreboot Configuration"
 source src/mainboard/Kconfig
 source src/arch/i386/Kconfig
 source src/arch/ppc/Kconfig
-source src/devices/Kconfig
 source src/northbridge/Kconfig
+source src/devices/Kconfig
 source src/southbridge/Kconfig
 source src/superio/Kconfig
 source src/cpu/Kconfig
@@ -41,16 +41,8 @@ config CBFS
        default y
 
 config PCI_BUS_SEGN_BITS
-       bool
-       default n
-
-config HT_CHAIN_UNITID_BASE
-       hex
-       default 0x1
-
-config HT_CHAIN_END_UNITID_BASE
-       hex
-       default 0x20
+       int
+       default 0
 
 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID
        hex

diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index e43458af8fe1b72572828d622da5eb4751a88c1b..173ae9df94ef4fcd2a5eff57366014e113e3e239 100644 (file)
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -79,7 +79,7 @@ config PCI_64BIT_PREF_MEM
 
 config HYPERTRANSPORT_PLUGIN_SUPPORT
        bool
-       default y
+       default n
 
 config PCIX_PLUGIN_SUPPORT
        bool

diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc
index 0c6677a57b5fda551bc89659a282aeb42bf4eaad..c932691fef327b7b60b539448c9c7fae7b847035 100644 (file)
--- a/src/devices/Makefile.inc
+++ b/src/devices/Makefile.inc
@@ -2,7 +2,7 @@ obj-y += device.o
 obj-y += root_device.o
 obj-y += device_util.o
 obj-y += pci_device.o
-obj-y += hypertransport.o
+obj-$(CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT) += hypertransport.o
 obj-y += pcix_device.o
 obj-y += pciexp_device.o
 obj-y += agp_device.o

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index f0363f036e67953f6406eb907983dcfd4b8e8667..087e6c06a83a3a71e45aa732c503494a884a907c 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -108,7 +108,6 @@ config HAVE_ACPI_TABLES
        default y
        depends on BOARD_ASUS_M2V_MX_SE
 
-
 config LB_CKS_RANGE_END
        int
        default 122
@@ -119,3 +118,23 @@ config LB_CKS_LOC
        default 123
        depends on BOARD_ASUS_M2V_MX_SE
 
+config HT_CHAIN_UNITID_BASE
+       hex
+       default 0x0
+       depends on BOARD_ASUS_M2V_MX_SE
+
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+       bool
+       default n
+       depends on BOARD_ASUS_M2V_MX_SE
+
+config SB_HT_CHAIN_ON_BUS0
+       int
+       default 1
+       depends on BOARD_ASUS_M2V_MX_SE
+
+config HT_CHAIN_END_UNITID_BASE
+       hex
+       default 0x20
+       depends on BOARD_ASUS_M2V_MX_SE
+

diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 11ad90c120dcee7dec746ae74d2e59fe46156a9c..59dbf8eb695af04906fc6162b47f1a3249f26b0a 100644 (file)
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -29,4 +29,9 @@ config HAVE_HIGH_TABLES
        bool
        default y
 
+config HYPERTRANSPORT_PLUGIN_SUPPORT
+       bool
+       default y
+       depends on NORTHBRIDGE_AMD_AMDK8
+
 source src/northbridge/amd/amdk8/root_complex/Kconfig