diff options
Diffstat (limited to 'src/mainboard')
-rw-r--r-- | src/mainboard/sunw/ultra40/Options.lb | 9 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40/auto.c | 2 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40/cache_as_ram_auto.c | 2 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40/chip.h | 4 | ||||
-rw-r--r-- | src/mainboard/sunw/ultra40/mptable.c | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb index c3f8ba3f8c..32748f5f1d 100644 --- a/src/mainboard/sunw/ultra40/Options.lb +++ b/src/mainboard/sunw/ultra40/Options.lb @@ -176,10 +176,11 @@ default CONFIG_IOAPIC=1 ## ## Clean up the motherboard id strings ## -default MAINBOARD_PART_NUMBER="s2895" -default MAINBOARD_VENDOR="Tyan" -default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x10f1 -default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x2895 +default MAINBOARD_PART_NUMBER="ultra40" +default MAINBOARD_VENDOR="sunw" + +default MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID=0x108e +default MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID=0x40 ### ### LinuxBIOS layout values diff --git a/src/mainboard/sunw/ultra40/auto.c b/src/mainboard/sunw/ultra40/auto.c index bf65cbe6a7..6ab2ac5b9e 100644 --- a/src/mainboard/sunw/ultra40/auto.c +++ b/src/mainboard/sunw/ultra40/auto.c @@ -174,7 +174,7 @@ static void main(unsigned long bist) sio_gpio_setup(); - setup_s2895_resource_map(); + setup_ultra40_resource_map(); needs_reset = setup_coherent_ht_domain(); diff --git a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c index 299f345b71..0ec0b7bac3 100644 --- a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c +++ b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c @@ -236,7 +236,7 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx) /* Halt if there was a built in self test failure */ report_bist_failure(bist); - setup_s2895_resource_map(); + setup_ultra40_resource_map(); needs_reset = setup_coherent_ht_domain(); diff --git a/src/mainboard/sunw/ultra40/chip.h b/src/mainboard/sunw/ultra40/chip.h index 350f4a6369..bd7b8634bc 100644 --- a/src/mainboard/sunw/ultra40/chip.h +++ b/src/mainboard/sunw/ultra40/chip.h @@ -1,6 +1,6 @@ -extern struct chip_operations mainboard_tyan_s2895_ops; +extern struct chip_operations mainboard_sunw_ultra40_ops; -struct mainboard_tyan_s2895_config { +struct mainboard_sunw_ultra40_config { // int fixup_scsi; // int fixup_vga; }; diff --git a/src/mainboard/sunw/ultra40/mptable.c b/src/mainboard/sunw/ultra40/mptable.c index a41cbcd12f..c63dbd2387 100644 --- a/src/mainboard/sunw/ultra40/mptable.c +++ b/src/mainboard/sunw/ultra40/mptable.c @@ -35,8 +35,8 @@ extern unsigned sbdnb; void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; - static const char oem[8] = "TYAN "; - static const char productid[12] = "S2895 "; + static const char oem[8] = "SUNW "; + static const char productid[12] = "ultra40 "; struct mp_config_table *mc; unsigned char bus_num; |