From 7b6ea25f2194bccb7680ed0bf05923ee504e1688 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 3 Apr 2009 16:40:44 +0000 Subject: [PATCH] Fix up the incomplete commit in r4055. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Reinauer Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4058 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/arima/hdama/auto.c | 0 src/mainboard/arima/hdama/failover.c | 0 src/mainboard/ibm/e325/auto.c | 181 ------------------------ src/mainboard/ibm/e325/failover.c | 0 src/mainboard/ibm/e326/auto.c | 181 ------------------------ src/mainboard/ibm/e326/failover.c | 0 src/mainboard/iwill/dk8s2/auto.c | 0 src/mainboard/iwill/dk8s2/failover.c | 0 src/mainboard/iwill/dk8x/auto.c | 0 src/mainboard/iwill/dk8x/failover.c | 0 src/mainboard/msi/ms9282/failover.c | 0 src/mainboard/newisys/khepri/auto.c | 0 src/mainboard/newisys/khepri/failover.c | 0 src/mainboard/sunw/ultra40/auto.c | 0 src/mainboard/sunw/ultra40/failover.c | 0 src/mainboard/tyan/s4880/auto.c | 0 src/mainboard/tyan/s4880/failover.c | 0 src/mainboard/tyan/s4882/auto.c | 0 src/mainboard/tyan/s4882/failover.c | 0 19 files changed, 362 deletions(-) delete mode 100644 src/mainboard/arima/hdama/auto.c delete mode 100644 src/mainboard/arima/hdama/failover.c delete mode 100644 src/mainboard/ibm/e325/auto.c delete mode 100644 src/mainboard/ibm/e325/failover.c delete mode 100644 src/mainboard/ibm/e326/auto.c delete mode 100644 src/mainboard/ibm/e326/failover.c delete mode 100644 src/mainboard/iwill/dk8s2/auto.c delete mode 100644 src/mainboard/iwill/dk8s2/failover.c delete mode 100644 src/mainboard/iwill/dk8x/auto.c delete mode 100644 src/mainboard/iwill/dk8x/failover.c delete mode 100644 src/mainboard/msi/ms9282/failover.c delete mode 100644 src/mainboard/newisys/khepri/auto.c delete mode 100644 src/mainboard/newisys/khepri/failover.c delete mode 100644 src/mainboard/sunw/ultra40/auto.c delete mode 100644 src/mainboard/sunw/ultra40/failover.c delete mode 100644 src/mainboard/tyan/s4880/auto.c delete mode 100644 src/mainboard/tyan/s4880/failover.c delete mode 100644 src/mainboard/tyan/s4882/auto.c delete mode 100644 src/mainboard/tyan/s4882/failover.c diff --git a/src/mainboard/arima/hdama/auto.c b/src/mainboard/arima/hdama/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/arima/hdama/failover.c b/src/mainboard/arima/hdama/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/ibm/e325/auto.c b/src/mainboard/ibm/e325/auto.c deleted file mode 100644 index e171775d8..000000000 --- a/src/mainboard/ibm/e325/auto.c +++ /dev/null @@ -1,181 +0,0 @@ -#define ASSEMBLY 1 -#define DEFAULT_CONSOLE_LOGLEVEL 8 -#define MAXIMUM_CONSOLE_LOGLEVEL 8 -#include -#include -#include -#include -#include -#include -#include -#include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "arch/i386/lib/console.c" -#include "ram/ramtest.c" -#include "southbridge/amd/amd8111/amd8111_early_smbus.c" -#include "northbridge/amd/amdk8/raminit.h" -#include "cpu/amd/model_fxx/apic_timer.c" -#include "lib/delay.c" -#include "cpu/x86/lapic/boot_cpu.c" -#include "northbridge/amd/amdk8/reset_test.c" -#include "northbridge/amd/amdk8/debug.c" -#include -#include "superio/nsc/pc87366/pc87366_early_serial.c" -#include "cpu/amd/mtrr/amd_earlymtrr.c" -#include "cpu/x86/bist.h" - -#define SERIAL_DEV PNP_DEV(0x2e, PC87366_SP1) - -static void hard_reset(void) -{ - set_bios_reset(); - - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} - -static void soft_reset(void) -{ - set_bios_reset(); - pci_write_config8(PCI_DEV(0, 0x04, 0), 0x47, 1); -} - -static void memreset_setup(void) -{ - if (is_cpu_pre_c0()) { - /* Set the memreset low */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 16); - /* Ensure the BIOS has control of the memory lines */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 17); - } else { - /* Ensure the CPU has controll of the memory lines */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 17); - } -} - -static void memreset(int controllers, const struct mem_controller *ctrl) -{ - if (is_cpu_pre_c0()) { - udelay(800); - /* Set memreset_high */ - outb((0<<7)|(0<<6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 16); - udelay(90); - } -} - -static inline void activate_spd_rom(const struct mem_controller *ctrl) -{ - /* nothing to do */ -} - -static inline int spd_read_byte(unsigned device, unsigned address) -{ - return smbus_read_byte(device, address); -} - -#include "northbridge/amd/amdk8/raminit.c" - -#include "northbridge/amd/amdk8/coherent_ht.c" -#include "northbridge/amd/amdk8/incoherent_ht.c" -#include "sdram/generic_sdram.c" -#include "mainboard/ibm/e325/resourcemap.c" -#include "cpu/amd/dualcore/dualcore.c" - -#define FIRST_CPU 1 -#define SECOND_CPU 1 -#define TOTAL_CPUS (FIRST_CPU + SECOND_CPU) -static void main(unsigned long bist) -{ - static const struct mem_controller cpu[] = { -#if FIRST_CPU - { - .node_id = 0, - .f0 = PCI_DEV(0, 0x18, 0), - .f1 = PCI_DEV(0, 0x18, 1), - .f2 = PCI_DEV(0, 0x18, 2), - .f3 = PCI_DEV(0, 0x18, 3), - .channel0 = { (0xa<<3)|0, (0xa<<3)|2, 0, 0 }, - .channel1 = { (0xa<<3)|1, (0xa<<3)|3, 0, 0 }, - }, -#endif -#if SECOND_CPU - { - .node_id = 1, - .f0 = PCI_DEV(0, 0x19, 0), - .f1 = PCI_DEV(0, 0x19, 1), - .f2 = PCI_DEV(0, 0x19, 2), - .f3 = PCI_DEV(0, 0x19, 3), - .channel0 = { (0xa<<3)|4, (0xa<<3)|6, 0, 0 }, - .channel1 = { (0xa<<3)|5, (0xa<<3)|7, 0, 0 }, - }, -#endif - }; - - int needs_reset; - unsigned nodeid; - - if (bist == 0) { - k8_init_and_stop_secondaries(); - } - /* Setup the console */ - pc87366_enable_serial(SERIAL_DEV, TTYS0_BASE); - uart_init(); - console_init(); - - /* Halt if there was a built in self test failure */ - report_bist_failure(bist); - -#if 0 - print_pci_devices(); -#endif - - setup_ibm_e325_resource_map(); - -#if 0 - print_debug("after setting resource\n"); - print_pci_devices(); -#endif - - needs_reset = setup_coherent_ht_domain(); - needs_reset |= ht_setup_chain(PCI_DEV(0, 0x18, 0), 0xA0); - -#if 0 - print_debug("after ht stuff\n"); - print_pci_devices(); -#endif - - if (needs_reset) { - print_info("ht reset -\r\n"); - soft_reset(); - } - -#if 0 - print_pci_devices(); -#endif - - enable_smbus(); - -#if 0 - dump_spd_registers(&cpu[0]); -#endif - - memreset_setup(); - sdram_initialize(ARRAY_SIZE(cpu), cpu); - -#if 0 - dump_pci_devices(); -#endif - -#if 0 - dump_pci_device(PCI_DEV(0, 0x18, 2)); -#endif - -#if 0 - /* Check the first 1M */ - ram_check(0x00000000, 0x001000000); -#endif -} diff --git a/src/mainboard/ibm/e325/failover.c b/src/mainboard/ibm/e325/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/ibm/e326/auto.c b/src/mainboard/ibm/e326/auto.c deleted file mode 100644 index f5c415d11..000000000 --- a/src/mainboard/ibm/e326/auto.c +++ /dev/null @@ -1,181 +0,0 @@ -#define ASSEMBLY 1 -#define DEFAULT_CONSOLE_LOGLEVEL 8 -#define MAXIMUM_CONSOLE_LOGLEVEL 8 -#include -#include -#include -#include -#include -#include -#include -#include -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" -#include "pc80/serial.c" -#include "arch/i386/lib/console.c" -#include "ram/ramtest.c" -#include "southbridge/amd/amd8111/amd8111_early_smbus.c" -#include "northbridge/amd/amdk8/raminit.h" -#include "cpu/amd/model_fxx/apic_timer.c" -#include "lib/delay.c" -#include "cpu/x86/lapic/boot_cpu.c" -#include "northbridge/amd/amdk8/reset_test.c" -#include "northbridge/amd/amdk8/debug.c" -#include -#include "superio/nsc/pc87366/pc87366_early_serial.c" -#include "cpu/amd/mtrr/amd_earlymtrr.c" -#include "cpu/x86/bist.h" - -#define SERIAL_DEV PNP_DEV(0x2e, PC87366_SP1) - -static void hard_reset(void) -{ - set_bios_reset(); - - /* enable cf9 */ - pci_write_config8(PCI_DEV(0, 0x04, 3), 0x41, 0xf1); - /* reset */ - outb(0x0e, 0x0cf9); -} - -static void soft_reset(void) -{ - set_bios_reset(); - pci_write_config8(PCI_DEV(0, 0x04, 0), 0x47, 1); -} - -static void memreset_setup(void) -{ - if (is_cpu_pre_c0()) { - /* Set the memreset low */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 16); - /* Ensure the BIOS has control of the memory lines */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 17); - } else { - /* Ensure the CPU has controll of the memory lines */ - outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 17); - } -} - -static void memreset(int controllers, const struct mem_controller *ctrl) -{ - if (is_cpu_pre_c0()) { - udelay(800); - /* Set memreset_high */ - outb((0<<7)|(0<<6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 16); - udelay(90); - } -} - -static inline void activate_spd_rom(const struct mem_controller *ctrl) -{ - /* nothing to do */ -} - -static inline int spd_read_byte(unsigned device, unsigned address) -{ - return smbus_read_byte(device, address); -} - -#include "northbridge/amd/amdk8/raminit.c" - -#include "northbridge/amd/amdk8/coherent_ht.c" -#include "northbridge/amd/amdk8/incoherent_ht.c" -#include "sdram/generic_sdram.c" -#include "mainboard/ibm/e326/resourcemap.c" -#include "cpu/amd/dualcore/dualcore.c" - -#define FIRST_CPU 1 -#define SECOND_CPU 1 -#define TOTAL_CPUS (FIRST_CPU + SECOND_CPU) -static void main(unsigned long bist) -{ - static const struct mem_controller cpu[] = { -#if FIRST_CPU - { - .node_id = 0, - .f0 = PCI_DEV(0, 0x18, 0), - .f1 = PCI_DEV(0, 0x18, 1), - .f2 = PCI_DEV(0, 0x18, 2), - .f3 = PCI_DEV(0, 0x18, 3), - .channel0 = { (0xa<<3)|0, (0xa<<3)|2, 0, 0 }, - .channel1 = { (0xa<<3)|1, (0xa<<3)|3, 0, 0 }, - }, -#endif -#if SECOND_CPU - { - .node_id = 1, - .f0 = PCI_DEV(0, 0x19, 0), - .f1 = PCI_DEV(0, 0x19, 1), - .f2 = PCI_DEV(0, 0x19, 2), - .f3 = PCI_DEV(0, 0x19, 3), - .channel0 = { (0xa<<3)|4, (0xa<<3)|6, 0, 0 }, - .channel1 = { (0xa<<3)|5, (0xa<<3)|7, 0, 0 }, - }, -#endif - }; - - int needs_reset; - unsigned nodeid; - - if (bist == 0) { - k8_init_and_stop_secondaries(); - } - /* Setup the console */ - pc87366_enable_serial(SERIAL_DEV, TTYS0_BASE); - uart_init(); - console_init(); - - /* Halt if there was a built in self test failure */ - report_bist_failure(bist); - -#if 0 - print_pci_devices(); -#endif - - setup_ibm_e326_resource_map(); - -#if 0 - print_debug("after setting resource\n"); - print_pci_devices(); -#endif - - needs_reset = setup_coherent_ht_domain(); - needs_reset |= ht_setup_chain(PCI_DEV(0, 0x18, 0), 0xA0); - -#if 0 - print_debug("after ht stuff\n"); - print_pci_devices(); -#endif - - if (needs_reset) { - print_info("ht reset -\r\n"); - soft_reset(); - } - -#if 0 - print_pci_devices(); -#endif - - enable_smbus(); - -#if 0 - dump_spd_registers(&cpu[0]); -#endif - - memreset_setup(); - sdram_initialize(ARRAY_SIZE(cpu), cpu); - -#if 0 - dump_pci_devices(); -#endif - -#if 0 - dump_pci_device(PCI_DEV(0, 0x18, 2)); -#endif - -#if 0 - /* Check the first 1M */ - ram_check(0x00000000, 0x001000000); -#endif -} diff --git a/src/mainboard/ibm/e326/failover.c b/src/mainboard/ibm/e326/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/iwill/dk8s2/auto.c b/src/mainboard/iwill/dk8s2/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/iwill/dk8s2/failover.c b/src/mainboard/iwill/dk8s2/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/iwill/dk8x/auto.c b/src/mainboard/iwill/dk8x/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/iwill/dk8x/failover.c b/src/mainboard/iwill/dk8x/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/msi/ms9282/failover.c b/src/mainboard/msi/ms9282/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/newisys/khepri/auto.c b/src/mainboard/newisys/khepri/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/newisys/khepri/failover.c b/src/mainboard/newisys/khepri/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/sunw/ultra40/auto.c b/src/mainboard/sunw/ultra40/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/sunw/ultra40/failover.c b/src/mainboard/sunw/ultra40/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/tyan/s4880/auto.c b/src/mainboard/tyan/s4880/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/tyan/s4880/failover.c b/src/mainboard/tyan/s4880/failover.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/tyan/s4882/auto.c b/src/mainboard/tyan/s4882/auto.c deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mainboard/tyan/s4882/failover.c b/src/mainboard/tyan/s4882/failover.c deleted file mode 100644 index e69de29bb..000000000 -- 2.25.1