aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/msi/ms7260
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-10-05 17:59:12 +0000
committerMyles Watson <mylesgw@gmail.com>2010-10-05 17:59:12 +0000
commitabc0c7791e18dbd97949a49016f9ebedb823ed84 (patch)
treea8c014275fe0c920ccf47f929ec7fe6a151834ea /src/mainboard/msi/ms7260
parent5692c5733633bfb8b23f1111de152eff0233b713 (diff)
attached patch moves a couple more config flags out of romstage:
CK804_USE_NIC, CK804_USE_ACI, CK804_NUM. MCP55_USE_NIC, MCP55_USE_ACI, MCP55_NUM. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Pter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5912 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/msi/ms7260')
-rw-r--r--src/mainboard/msi/ms7260/Kconfig2
-rw-r--r--src/mainboard/msi/ms7260/romstage.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 106db7b70b..a7f9e1afe6 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -8,6 +8,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select NORTHBRIDGE_AMD_AMDK8
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
+ select MCP55_USE_NIC
+ select MCP55_USE_AZA
select SUPERIO_WINBOND_W83627EHG
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index 762da8ced5..ebd54f4ef5 100644
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -92,9 +92,6 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
#include "resourcemap.c"
#include "cpu/amd/dualcore/dualcore.c"
-#define MCP55_NUM 1
-#define MCP55_USE_NIC 1
-#define MCP55_USE_AZA 1
#define MCP55_PCI_E_X_0 0
#define MCP55_MB_SETUP \