summaryrefslogtreecommitdiff
path: root/src/mainboard/sunw/ultra40
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-16 00:31:44 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-16 00:31:44 +0000
commitd6532116c94c705c7e94a34ab2f046e431fb3682 (patch)
tree6068b85e702f6eaf5b40fa273edfb9bfc4d155a1 /src/mainboard/sunw/ultra40
parente46c1c85c90b6d263f951ab745a9fadd93041111 (diff)
downloadcoreboot-d6532116c94c705c7e94a34ab2f046e431fb3682.tar.xz
zero warnings days: unify mp tables. fix warnings.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5448 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/sunw/ultra40')
-rw-r--r--src/mainboard/sunw/ultra40/mptable.c2
-rw-r--r--src/mainboard/sunw/ultra40/romstage.c21
2 files changed, 7 insertions, 16 deletions
diff --git a/src/mainboard/sunw/ultra40/mptable.c b/src/mainboard/sunw/ultra40/mptable.c
index e3b22e7523..b019ffea13 100644
--- a/src/mainboard/sunw/ultra40/mptable.c
+++ b/src/mainboard/sunw/ultra40/mptable.c
@@ -36,7 +36,7 @@ extern unsigned sbdnb;
static void *smp_write_config_table(void *v)
{
static const char sig[4] = "PCMP";
- static const char oem[8] = "SUNW ";
+ static const char oem[8] = "COREBOOT";
static const char productid[12] = "ultra40 ";
struct mp_config_table *mc;
diff --git a/src/mainboard/sunw/ultra40/romstage.c b/src/mainboard/sunw/ultra40/romstage.c
index 5580d9a189..de16a4481f 100644
--- a/src/mainboard/sunw/ultra40/romstage.c
+++ b/src/mainboard/sunw/ultra40/romstage.c
@@ -41,10 +41,6 @@
#define SERIAL_DEV PNP_DEV(0x2e, LPC47B397_SP1)
-static void memreset_setup(void)
-{
-}
-
static void memreset(int controllers, const struct mem_controller *ctrl)
{
}
@@ -53,16 +49,17 @@ static void memreset(int controllers, const struct mem_controller *ctrl)
#define SUPERIO_GPIO_IO_BASE 0x400
-static void sio_gpio_setup(void){
-
+#ifdef ENABLE_ONBOARD_SCSI
+static void sio_gpio_setup(void)
+{
unsigned value;
/*Enable onboard scsi*/
lpc47b397_gpio_offset_out(SUPERIO_GPIO_IO_BASE, 0x2c, (1<<7)|(0<<2)|(0<<1)|(0<<0)); // GP21, offset 0x2c, DISABLE_SCSI_L
value = lpc47b397_gpio_offset_in(SUPERIO_GPIO_IO_BASE, 0x4c);
lpc47b397_gpio_offset_out(SUPERIO_GPIO_IO_BASE, 0x4c, (value|(1<<1)));
-
}
+#endif
static inline void activate_spd_rom(const struct mem_controller *ctrl)
{
@@ -111,11 +108,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
static void sio_setup(void)
{
-
unsigned value;
uint32_t dword;
uint8_t byte;
-
pci_write_config32(PCI_DEV(0, CK804_DEVN_BASE+1, 0), 0xac, 0x047f0400);
@@ -127,25 +122,22 @@ static void sio_setup(void)
dword |= (1<<29)|(1<<0);
pci_write_config32(PCI_DEV(0, CK804_DEVN_BASE+1 , 0), 0xa0, dword);
-#if 1
lpc47b397_enable_serial(SUPERIO_GPIO_DEV, SUPERIO_GPIO_IO_BASE);
value = lpc47b397_gpio_offset_in(SUPERIO_GPIO_IO_BASE, 0x77);
value &= 0xbf;
lpc47b397_gpio_offset_out(SUPERIO_GPIO_IO_BASE, 0x77, value);
-#endif
-
}
void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
{
static const uint16_t spd_addr [] = {
+ // Node 0
(0xa<<3)|0, (0xa<<3)|2, 0, 0,
(0xa<<3)|1, (0xa<<3)|3, 0, 0,
-#if CONFIG_MAX_PHYSICAL_CPUS > 1
+ // Node 1
(0xa<<3)|4, (0xa<<3)|6, 0, 0,
(0xa<<3)|5, (0xa<<3)|7, 0, 0,
-#endif
};
int needs_reset;
@@ -205,7 +197,6 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
enable_smbus();
- memreset_setup();
sdram_initialize(nodes, ctrl);
post_cache_as_ram();