From 5fa76e2864fada5a87d210a0b994a55f8a235024 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Mon, 1 Mar 2010 20:16:38 +0000 Subject: Whitespace changes to make s2912_fam10/ms9652_fam10 more similar. Also, fix another typo in the ms9652 board name. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5184 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/tyan/s2912_fam10/Kconfig | 16 ++++++++-------- src/mainboard/tyan/s2912_fam10/get_bus_conf.c | 2 -- src/mainboard/tyan/s2912_fam10/mptable.c | 2 +- src/mainboard/tyan/s2912_fam10/romstage.c | 12 +++++------- 4 files changed, 14 insertions(+), 18 deletions(-) (limited to 'src/mainboard/tyan/s2912_fam10') diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig index c71ffd8889..91f8f45457 100644 --- a/src/mainboard/tyan/s2912_fam10/Kconfig +++ b/src/mainboard/tyan/s2912_fam10/Kconfig @@ -27,7 +27,7 @@ config DCACHE_RAM_BASE hex default 0xc4000 depends on BOARD_TYAN_S2912_FAM10 - + config DCACHE_RAM_SIZE hex default 0x0c000 @@ -39,7 +39,7 @@ config DCACHE_RAM_GLOBAL_VAR_SIZE depends on BOARD_TYAN_S2912_FAM10 config APIC_ID_OFFSET - hex + hex default 0 depends on BOARD_TYAN_S2912_FAM10 @@ -65,7 +65,7 @@ config LB_CKS_RANGE_END config LB_CKS_LOC int - default 123 + default 123 depends on BOARD_TYAN_S2912_FAM10 config MAINBOARD_PART_NUMBER @@ -75,7 +75,7 @@ config MAINBOARD_PART_NUMBER config PCI_64BIT_PREF_MEM bool - default n + default n depends on BOARD_TYAN_S2912_FAM10 config HAVE_FALLBACK_BOOT @@ -104,7 +104,7 @@ config MAX_PHYSICAL_CPUS depends on BOARD_TYAN_S2912_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC - bool + bool default n depends on BOARD_TYAN_S2912_FAM10 @@ -114,7 +114,7 @@ config HT_CHAIN_UNITID_BASE depends on BOARD_TYAN_S2912_FAM10 config HT_CHAIN_END_UNITID_BASE - hex + hex default 0x20 depends on BOARD_TYAN_S2912_FAM10 @@ -124,12 +124,12 @@ config USE_INIT depends on BOARD_TYAN_S2912_FAM10 config SERIAL_CPU_INIT - bool + bool default n depends on BOARD_TYAN_S2912_FAM10 config WAIT_BEFORE_CPUS_INIT - bool + bool default n depends on BOARD_TYAN_S2912_FAM10 diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c index 79520bdcf3..7ee4944a9c 100644 --- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c +++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c @@ -68,7 +68,6 @@ static unsigned get_bus_conf_done = 0; void get_bus_conf(void) { - unsigned apicid_base; struct mb_sysconf_t *m; @@ -134,5 +133,4 @@ void get_bus_conf(void) apicid_base = CONFIG_MAX_PHYSICAL_CPUS; #endif m->apicid_mcp55 = apicid_base+0; - } diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c index 36767e96e6..b2fae1f443 100644 --- a/src/mainboard/tyan/s2912_fam10/mptable.c +++ b/src/mainboard/tyan/s2912_fam10/mptable.c @@ -100,7 +100,7 @@ void *smp_write_config_table(void *v) } - /*I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */ + /*I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */ smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa, 0x0, m->apicid_mcp55, 0x0); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa, 0x1, m->apicid_mcp55, 0x1); smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa, 0x0, m->apicid_mcp55, 0x2); diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c index 1216c298b9..45d0d9401a 100644 --- a/src/mainboard/tyan/s2912_fam10/romstage.c +++ b/src/mainboard/tyan/s2912_fam10/romstage.c @@ -150,10 +150,8 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "southbridge/nvidia/mcp55/mcp55_enable_rom.c" #include "northbridge/amd/amdfam10/early_ht.c" - static void sio_setup(void) { - unsigned value; uint32_t dword; uint8_t byte; @@ -278,10 +276,10 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx) #endif val = cpuid_eax(1); - printk_debug("BSP Family_Model: %08x \n", val); + printk_debug("BSP Family_Model: %08x\n", val); printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); - printk_debug("bsp_apicid = %02x \n", bsp_apicid); - printk_debug("cpu_init_detectedx = %08x \n", cpu_init_detectedx); + printk_debug("bsp_apicid = %02x\n", bsp_apicid); + printk_debug("cpu_init_detectedx = %08x\n", cpu_init_detectedx); /* Setup sysinfo defaults */ set_sysinfo_in_ram(0); @@ -322,7 +320,7 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx) #if FAM10_SET_FIDVID == 1 msr = rdmsr(0xc0010071); - printk_debug("\nBegin FIDVID MSR 0xc0010071 0x%08x 0x%08x \n", msr.hi, msr.lo); + printk_debug("\nBegin FIDVID MSR 0xc0010071 0x%08x 0x%08x\n", msr.hi, msr.lo); /* FIXME: The sb fid change may survive the warm reset and only * need to be done once.*/ @@ -340,7 +338,7 @@ void real_main(unsigned long bist, unsigned long cpu_init_detectedx) /* show final fid and vid */ msr=rdmsr(0xc0010071); - printk_debug("End FIDVIDMSR 0xc0010071 0x%08x 0x%08x \n", msr.hi, msr.lo); + printk_debug("End FIDVIDMSR 0xc0010071 0x%08x 0x%08x\n", msr.hi, msr.lo); #endif wants_reset = mcp55_early_setup_x(); -- cgit v1.2.3