summaryrefslogtreecommitdiff
path: root/src/mainboard/sunw
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/sunw
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/sunw')
-rw-r--r--src/mainboard/sunw/ultra40/Kconfig2
-rw-r--r--src/mainboard/sunw/ultra40/romstage.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index ac07513fde..0c2a781332 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_MP_TABLE
select HAVE_HARD_RESET
select BOARD_ROMSIZE_KB_1024
+ select CK804_USE_NIC
+ select CK804_USE_ACI
config MAINBOARD_DIR
string
diff --git a/src/mainboard/sunw/ultra40/romstage.c b/src/mainboard/sunw/ultra40/romstage.c
index 86a194c735..992d0abde1 100644
--- a/src/mainboard/sunw/ultra40/romstage.c
+++ b/src/mainboard/sunw/ultra40/romstage.c
@@ -78,9 +78,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "cpu/amd/dualcore/dualcore.c"
-#define CK804_USE_NIC 1
-#define CK804_USE_ACI 1
-
#include "southbridge/nvidia/ck804/ck804_early_setup_ss.h"
//set GPIO to input mode