[commit] r5268 - in trunk/src: cpu/amd/car cpu/amd/model_gx2 cpu/amd/sc520 mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_...
Author: myles Date: Mon Mar 22 17:33:25 2010 New Revision: 5268 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5268
Log: Fix all the format string warnings. Some other random warnings.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/cpu/amd/car/post_cache_as_ram.c trunk/src/cpu/amd/model_gx2/cpubug.c trunk/src/cpu/amd/sc520/sc520.c trunk/src/mainboard/amd/dbm690t/mptable.c trunk/src/mainboard/amd/dbm690t/romstage.c trunk/src/mainboard/amd/mahogany/mainboard.c trunk/src/mainboard/amd/mahogany/mptable.c trunk/src/mainboard/amd/mahogany/romstage.c trunk/src/mainboard/amd/mahogany_fam10/mainboard.c trunk/src/mainboard/amd/mahogany_fam10/mptable.c trunk/src/mainboard/amd/mahogany_fam10/romstage.c trunk/src/mainboard/amd/pistachio/mptable.c trunk/src/mainboard/amd/pistachio/romstage.c trunk/src/mainboard/amd/serengeti_cheetah/mptable.c trunk/src/mainboard/amd/serengeti_cheetah/romstage.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c trunk/src/mainboard/asus/a8n_e/irq_tables.c trunk/src/mainboard/asus/a8n_e/mptable.c trunk/src/mainboard/asus/a8v-e_se/mptable.c trunk/src/mainboard/asus/p2b-d/mptable.c trunk/src/mainboard/asus/p2b-ds/mptable.c trunk/src/mainboard/broadcom/blast/irq_tables.c trunk/src/mainboard/broadcom/blast/mptable.c trunk/src/mainboard/dell/s1850/reset.c trunk/src/mainboard/digitallogic/msm586seg/mainboard.c trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c trunk/src/mainboard/gigabyte/ga_2761gxdk/mptable.c trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c trunk/src/mainboard/gigabyte/m57sli/irq_tables.c trunk/src/mainboard/gigabyte/m57sli/mptable.c trunk/src/mainboard/gigabyte/m57sli/romstage.c trunk/src/mainboard/hp/dl145_g3/mptable.c trunk/src/mainboard/hp/dl145_g3/romstage.c trunk/src/mainboard/ibm/e325/mptable.c trunk/src/mainboard/ibm/e326/mptable.c trunk/src/mainboard/intel/eagleheights/mptable.c trunk/src/mainboard/intel/eagleheights/reset.c trunk/src/mainboard/intel/jarrell/mptable.c trunk/src/mainboard/intel/jarrell/reset.c trunk/src/mainboard/intel/mtarvon/mptable.c trunk/src/mainboard/intel/truxton/mptable.c trunk/src/mainboard/intel/xe7501devkit/mptable.c trunk/src/mainboard/iwill/dk8_htx/romstage.c trunk/src/mainboard/iwill/dk8s2/mptable.c trunk/src/mainboard/iwill/dk8s2/romstage.c trunk/src/mainboard/iwill/dk8x/mptable.c trunk/src/mainboard/iwill/dk8x/romstage.c trunk/src/mainboard/kontron/kt690/mptable.c trunk/src/mainboard/kontron/kt690/romstage.c trunk/src/mainboard/msi/ms7135/irq_tables.c trunk/src/mainboard/msi/ms7135/mptable.c trunk/src/mainboard/msi/ms7260/irq_tables.c trunk/src/mainboard/msi/ms7260/mptable.c trunk/src/mainboard/msi/ms7260/romstage.c trunk/src/mainboard/msi/ms9185/irq_tables.c trunk/src/mainboard/msi/ms9185/mptable.c trunk/src/mainboard/msi/ms9185/romstage.c trunk/src/mainboard/msi/ms9282/irq_tables.c trunk/src/mainboard/msi/ms9282/mptable.c trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c trunk/src/mainboard/msi/ms9652_fam10/mptable.c trunk/src/mainboard/msi/ms9652_fam10/romstage.c trunk/src/mainboard/newisys/khepri/mptable.c trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c trunk/src/mainboard/nvidia/l1_2pvv/mptable.c trunk/src/mainboard/nvidia/l1_2pvv/romstage.c trunk/src/mainboard/olpc/btest/mainboard.c trunk/src/mainboard/olpc/rev_a/mainboard.c trunk/src/mainboard/rca/rm4100/mainboard_smi.c trunk/src/mainboard/sunw/ultra40/irq_tables.c trunk/src/mainboard/sunw/ultra40/mptable.c trunk/src/mainboard/supermicro/h8dme/irq_tables.c trunk/src/mainboard/supermicro/h8dme/mptable.c trunk/src/mainboard/supermicro/h8dme/romstage.c trunk/src/mainboard/supermicro/h8dmr/irq_tables.c trunk/src/mainboard/supermicro/h8dmr/mptable.c trunk/src/mainboard/supermicro/h8dmr/romstage.c trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c trunk/src/mainboard/supermicro/x6dai_g/mptable.c trunk/src/mainboard/supermicro/x6dai_g/reset.c trunk/src/mainboard/supermicro/x6dhe_g/mptable.c trunk/src/mainboard/supermicro/x6dhe_g/reset.c trunk/src/mainboard/supermicro/x6dhe_g2/mptable.c trunk/src/mainboard/supermicro/x6dhe_g2/reset.c trunk/src/mainboard/supermicro/x6dhr_ig/mptable.c trunk/src/mainboard/supermicro/x6dhr_ig/reset.c trunk/src/mainboard/supermicro/x6dhr_ig2/mptable.c trunk/src/mainboard/supermicro/x6dhr_ig2/reset.c trunk/src/mainboard/technexion/tim5690/mptable.c trunk/src/mainboard/technexion/tim5690/romstage.c trunk/src/mainboard/technexion/tim8690/mptable.c trunk/src/mainboard/technexion/tim8690/romstage.c trunk/src/mainboard/technologic/ts5300/mainboard.c trunk/src/mainboard/tyan/s2735/mptable.c trunk/src/mainboard/tyan/s2850/mptable.c trunk/src/mainboard/tyan/s2875/mptable.c trunk/src/mainboard/tyan/s2880/mptable.c trunk/src/mainboard/tyan/s2881/irq_tables.c trunk/src/mainboard/tyan/s2881/mptable.c trunk/src/mainboard/tyan/s2882/irq_tables.c trunk/src/mainboard/tyan/s2882/mptable.c trunk/src/mainboard/tyan/s2885/irq_tables.c trunk/src/mainboard/tyan/s2885/mptable.c trunk/src/mainboard/tyan/s2891/irq_tables.c trunk/src/mainboard/tyan/s2891/mptable.c trunk/src/mainboard/tyan/s2912/irq_tables.c trunk/src/mainboard/tyan/s2912/mptable.c trunk/src/mainboard/tyan/s2912/romstage.c trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c trunk/src/mainboard/tyan/s2912_fam10/mptable.c trunk/src/mainboard/tyan/s2912_fam10/romstage.c trunk/src/mainboard/tyan/s4880/mptable.c trunk/src/mainboard/tyan/s4882/mptable.c trunk/src/mainboard/via/epia-m/vgabios.c trunk/src/mainboard/via/epia-n/mptable.c trunk/src/mainboard/via/pc2500e/mptable.c trunk/src/mainboard/via/vt8454c/mptable.c trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c trunk/src/northbridge/amd/amdfam10/debug.c trunk/src/northbridge/amd/amdfam10/northbridge.c trunk/src/northbridge/amd/amdk8/northbridge.c trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c trunk/src/northbridge/amd/gx2/northbridge.c trunk/src/northbridge/amd/gx2/northbridgeinit.c trunk/src/northbridge/amd/lx/northbridge.c trunk/src/northbridge/intel/i3100/pciexp_porta_ep80579.c trunk/src/northbridge/intel/i82810/northbridge.c trunk/src/northbridge/intel/i855/northbridge.c trunk/src/northbridge/via/cn400/northbridge.c trunk/src/northbridge/via/cn400/vgabios.c trunk/src/northbridge/via/cn700/northbridge.c trunk/src/northbridge/via/cn700/vgabios.c trunk/src/northbridge/via/cx700/vgabios.c trunk/src/northbridge/via/vt8623/northbridge.c trunk/src/northbridge/via/vx800/northbridge.c trunk/src/northbridge/via/vx800/vgabios.c trunk/src/southbridge/amd/rs780/rs780_pcie.c trunk/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c trunk/src/southbridge/intel/i3100/i3100_lpc.c trunk/src/southbridge/intel/i3100/i3100_reset.c trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c trunk/src/southbridge/intel/i82801ex/i82801ex_reset.c trunk/src/southbridge/intel/i82870/p64h2_ioapic.c trunk/src/southbridge/nvidia/ck804/ck804_nic.c trunk/src/southbridge/nvidia/mcp55/mcp55_aza.c trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c trunk/src/southbridge/ricoh/rl5c476/rl5c476.c trunk/src/southbridge/sis/sis966/sis966_aza.c trunk/src/southbridge/sis/sis966/sis966_early_smbus.c trunk/src/southbridge/sis/sis966/sis966_lpc.c trunk/src/southbridge/sis/sis966/sis966_nic.c trunk/src/southbridge/sis/sis966/sis966_usb2.c trunk/src/superio/via/vt1211/vt1211.c
Modified: trunk/src/cpu/amd/car/post_cache_as_ram.c ============================================================================== --- trunk/src/cpu/amd/car/post_cache_as_ram.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/cpu/amd/car/post_cache_as_ram.c Mon Mar 22 17:33:25 2010 (r5268) @@ -97,7 +97,7 @@ /* clear only coreboot used region of memory. Note: this may break ECC enabled boards */ memset((void*) CONFIG_RAMBASE, 0, (CONFIG_RAMTOP) - CONFIG_RAMBASE - CONFIG_DCACHE_RAM_SIZE); #else - memset((void*)0, 0, ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_SIZE)); + //memset((void*)CONFIG_RAMBASE, 0, ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_SIZE - 0xa0000)); #endif print_debug("Done\r\n");
Modified: trunk/src/cpu/amd/model_gx2/cpubug.c ============================================================================== --- trunk/src/cpu/amd/model_gx2/cpubug.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/cpu/amd/model_gx2/cpubug.c Mon Mar 22 17:33:25 2010 (r5268) @@ -356,7 +356,7 @@
rev = msr.lo & 0xff; if (rev < 0x20) { - printk(BIOS_ERR, "%s: rev < 0x20! bailing!\n"); + printk(BIOS_ERR, "%s: rev < 0x20! bailing!\n", __func__); return; } printk(BIOS_DEBUG, "Doing cpubug fixes for rev 0x%x\n", rev);
Modified: trunk/src/cpu/amd/sc520/sc520.c ============================================================================== --- trunk/src/cpu/amd/sc520/sc520.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/cpu/amd/sc520/sc520.c Mon Mar 22 17:33:25 2010 (r5268) @@ -12,11 +12,12 @@ #include <stdlib.h> #include <string.h> #include <bitops.h> +#include <delay.h> #include "chip.h"
/* hack for now */ -void sc520_udelay(int microseconds) { +static void sc520_udelay(int microseconds) { volatile int x; for(x = 0; x < 1000; x++) ; @@ -24,7 +25,7 @@
/* looks like we define this now */ void -udelay(int microseconds) { +udelay(unsigned microseconds) { sc520_udelay(microseconds); } /* @@ -46,7 +47,7 @@ * there is no real northbridge, keep it here in cpu. * Ron wins, he's writing the code. */ -void sc520_enable_resources(struct device *dev) { +static void sc520_enable_resources(struct device *dev) { unsigned char command;
printk(BIOS_SPEW, "%s\n", __func__); @@ -100,7 +101,7 @@ unsigned long basek, unsigned long sizek) { struct resource *resource; - printk(BIOS_SPEW, "%s sizek 0x%x\n", __func__, sizek); + printk(BIOS_SPEW, "%s sizek 0x%lx\n", __func__, sizek); if (!sizek) { return; }
Modified: trunk/src/mainboard/amd/dbm690t/mptable.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/dbm690t/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "ATI ";
Modified: trunk/src/mainboard/amd/dbm690t/romstage.c ============================================================================== --- trunk/src/mainboard/amd/dbm690t/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/dbm690t/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -188,7 +188,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);
Modified: trunk/src/mainboard/amd/mahogany/mainboard.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -153,10 +153,10 @@ * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk(BIOS_INFO, "uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); - lb_add_memory_range(mem, LB_MEM_RESERVED, - uma_memory_base, uma_memory_size); + printk(BIOS_INFO, "uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); + lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, + uma_memory_size); #endif }
Modified: trunk/src/mainboard/amd/mahogany/mptable.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -39,7 +39,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD ";
Modified: trunk/src/mainboard/amd/mahogany/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -186,7 +186,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);
Modified: trunk/src/mainboard/amd/mahogany_fam10/mainboard.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany_fam10/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -153,10 +153,10 @@ * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk(BIOS_INFO, "uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); - lb_add_memory_range(mem, LB_MEM_RESERVED, - uma_memory_base, uma_memory_size); + printk(BIOS_INFO, "uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); + lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, + uma_memory_size); #endif }
Modified: trunk/src/mainboard/amd/mahogany_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -39,7 +39,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD ";
Modified: trunk/src/mainboard/amd/mahogany_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/mahogany_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -184,9 +184,9 @@ // Load MPB val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x \n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x \n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/amd/pistachio/mptable.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/pistachio/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "ATI ";
Modified: trunk/src/mainboard/amd/pistachio/romstage.c ============================================================================== --- trunk/src/mainboard/amd/pistachio/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/pistachio/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -193,7 +193,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr);
Modified: trunk/src/mainboard/amd/serengeti_cheetah/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -12,7 +12,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD ";
Modified: trunk/src/mainboard/amd/serengeti_cheetah/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -208,7 +208,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_mb_resource_map(); #if 0
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Mar 22 17:33:25 2010 (r5268) @@ -64,6 +64,11 @@ default 8 depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
+config LOGICAL_CPUS + bool + default n + depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 + config HW_MEM_HOLE_SIZE_AUTO_INC bool default n
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -70,7 +70,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (u8 *)(addr);
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD ";
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -186,9 +186,9 @@ // Load MPB val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x \n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x \n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/asus/a8n_e/irq_tables.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/asus/a8n_e/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -78,7 +78,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000. */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/asus/a8n_e/mptable.c ============================================================================== --- trunk/src/mainboard/asus/a8n_e/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/asus/a8n_e/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -34,7 +34,7 @@ extern unsigned bus_type[256]; extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "ASUS ";
Modified: trunk/src/mainboard/asus/a8v-e_se/mptable.c ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/asus/a8v-e_se/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -23,7 +23,7 @@ #include <../../../southbridge/via/vt8237r/vt8237r.h> #include <../../../southbridge/via/k8t890/k8t890.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXB ";
Modified: trunk/src/mainboard/asus/p2b-d/mptable.c ============================================================================== --- trunk/src/mainboard/asus/p2b-d/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/asus/p2b-d/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -24,7 +24,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "COREBOOT";
Modified: trunk/src/mainboard/asus/p2b-ds/mptable.c ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/asus/p2b-ds/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -24,7 +24,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "COREBOOT";
Modified: trunk/src/mainboard/broadcom/blast/irq_tables.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/broadcom/blast/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -60,7 +60,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/broadcom/blast/mptable.c ============================================================================== --- trunk/src/mainboard/broadcom/blast/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/broadcom/blast/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -21,7 +21,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "BROADCOM";
Modified: trunk/src/mainboard/dell/s1850/reset.c ============================================================================== --- trunk/src/mainboard/dell/s1850/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/dell/s1850/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,5 +1,5 @@ #include <arch/io.h> - +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -25,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/digitallogic/msm586seg/mainboard.c ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/digitallogic/msm586seg/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -26,7 +26,7 @@ printk(BIOS_ERR, "mmcr is %p\n", mmcr); for(i = 0; irqlist[i] >= 0; i++) { irq = mmcr + irqlist[i]; - printk(BIOS_ERR, "0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq); + printk(BIOS_ERR, "0x%x register @%p is 0x%x\n", irqlist[i], irq, *irq); }
}
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -77,7 +77,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/mptable.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -35,7 +35,7 @@
extern unsigned bus_type[256];
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "GIGABYTE";
Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -218,7 +218,7 @@ early_usbdebug_direct_init(); #endif console_init(); - print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/gigabyte/m57sli/irq_tables.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/m57sli/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -75,7 +75,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/gigabyte/m57sli/mptable.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/m57sli/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -36,7 +36,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "GIGABYTE";
Modified: trunk/src/mainboard/gigabyte/m57sli/romstage.c ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/gigabyte/m57sli/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -232,7 +232,7 @@ early_usbdebug_direct_init(); #endif console_init(); - print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/hp/dl145_g3/mptable.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/hp/dl145_g3/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -43,7 +43,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "HP "; @@ -101,7 +101,7 @@ if (dev) { res = find_resource(dev, PCI_BASE_ADDRESS_0); if (res) { - printk(BIOS_DEBUG, "APIC %d base address: %x\n",m->apicid_bcm5785[i], res->base); + printk(BIOS_DEBUG, "APIC %d base address: %llx\n",m->apicid_bcm5785[i], res->base); smp_write_ioapic(mc, m->apicid_bcm5785[i], 0x11, res->base); } }
Modified: trunk/src/mainboard/hp/dl145_g3/romstage.c ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/hp/dl145_g3/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -236,7 +236,7 @@ console_init(); // setup_early_ipmi_serial(); pilot_early_init(SERIAL_DEV); //config port is being taken from SERIAL_DEV - print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/ibm/e325/mptable.c ============================================================================== --- trunk/src/mainboard/ibm/e325/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/ibm/e325/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "IBM ";
Modified: trunk/src/mainboard/ibm/e326/mptable.c ============================================================================== --- trunk/src/mainboard/ibm/e326/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/ibm/e326/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "IBM ";
Modified: trunk/src/mainboard/intel/eagleheights/mptable.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/eagleheights/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -58,7 +58,7 @@ #define RCBA_D29IR 0x3144 #define RCBA_D28IR 0x3146
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "Intel ";
Modified: trunk/src/mainboard/intel/eagleheights/reset.c ============================================================================== --- trunk/src/mainboard/intel/eagleheights/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/eagleheights/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -20,6 +20,7 @@ */
#include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -45,18 +46,3 @@ { outb(0x06, 0xcf9); } - -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_3100_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - } - outb(0x0e, 0xcf9); -} -
Modified: trunk/src/mainboard/intel/jarrell/mptable.c ============================================================================== --- trunk/src/mainboard/intel/jarrell/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/jarrell/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/intel/jarrell/reset.c ============================================================================== --- trunk/src/mainboard/intel/jarrell/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/jarrell/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__)
Modified: trunk/src/mainboard/intel/mtarvon/mptable.c ============================================================================== --- trunk/src/mainboard/intel/mtarvon/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/mtarvon/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -26,7 +26,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "Intel ";
Modified: trunk/src/mainboard/intel/truxton/mptable.c ============================================================================== --- trunk/src/mainboard/intel/truxton/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/truxton/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -24,7 +24,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "Intel ";
Modified: trunk/src/mainboard/intel/xe7501devkit/mptable.c ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/intel/xe7501devkit/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -142,7 +142,7 @@ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE |MP_IRQ_POLARITY_HIGH, SUPERIO_BUS, 15, IOAPIC_ICH3, 15); }
-void* smp_write_config_table(void* v) +static void *smp_write_config_table(void* v) { static const char sig[4] = MPC_SIGNATURE; static const char oem[8] = "INTEL ";
Modified: trunk/src/mainboard/iwill/dk8_htx/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/iwill/dk8_htx/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -168,7 +168,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_mb_resource_map();
Modified: trunk/src/mainboard/iwill/dk8s2/mptable.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/iwill/dk8s2/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "IWILL ";
Modified: trunk/src/mainboard/iwill/dk8s2/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/iwill/dk8s2/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -168,7 +168,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_default_resource_map();
Modified: trunk/src/mainboard/iwill/dk8x/mptable.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/iwill/dk8x/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "IWILL ";
Modified: trunk/src/mainboard/iwill/dk8x/romstage.c ============================================================================== --- trunk/src/mainboard/iwill/dk8x/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/iwill/dk8x/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -167,7 +167,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_default_resource_map();
Modified: trunk/src/mainboard/kontron/kt690/mptable.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/kontron/kt690/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "KONTRON ";
Modified: trunk/src/mainboard/kontron/kt690/romstage.c ============================================================================== --- trunk/src/mainboard/kontron/kt690/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/kontron/kt690/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -191,7 +191,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);
Modified: trunk/src/mainboard/msi/ms7135/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms7135/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -91,7 +91,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *) (addr);
Modified: trunk/src/mainboard/msi/ms7135/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms7135/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms7135/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "MSI ";
Modified: trunk/src/mainboard/msi/ms7260/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms7260/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -71,7 +71,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 and 0x100000. */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/msi/ms7260/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms7260/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -33,7 +33,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "MSI ";
Modified: trunk/src/mainboard/msi/ms7260/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms7260/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms7260/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -190,12 +190,7 @@ #endif console_init();
- print_debug("*sysinfo range: ["); - print_debug_hex32(sysinfo); - print_debug(","); - print_debug_hex32((unsigned long)sysinfo + sizeof(struct sys_info)); - print_debug(")\r\n"); - + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/msi/ms9185/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9185/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -82,7 +82,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/msi/ms9185/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9185/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -40,7 +40,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[3] = "MSI";
Modified: trunk/src/mainboard/msi/ms9185/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9185/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9185/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -203,7 +203,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_ms9185_resource_map(); #if 0
Modified: trunk/src/mainboard/msi/ms9282/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9282/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -79,7 +79,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/msi/ms9282/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9282/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9282/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -34,7 +34,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "MSI ";
Modified: trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9652_fam10/get_bus_conf.c Mon Mar 22 17:33:25 2010 (r5268) @@ -131,10 +131,10 @@ /*I/O APICs: APIC ID Version State Address*/ #if CONFIG_LOGICAL_CPUS==1 apicid_base = get_apicid_base(1); - printk(BIOS_SPEW, "CONFIG_LOGICAL_CPUS==1: apicid_base: %08x\n"); + printk(BIOS_SPEW, "CONFIG_LOGICAL_CPUS==1: apicid_base: %08x\n", apicid_base); #else apicid_base = CONFIG_MAX_PHYSICAL_CPUS; - printk(BIOS_SPEW, "CONFIG_LOGICAL_CPUS==0: apicid_base: %08x\n"); + printk(BIOS_SPEW, "CONFIG_LOGICAL_CPUS==0: apicid_base: %08x\n", apicid_base); #endif m->apicid_mcp55 = apicid_base+0; }
Modified: trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9652_fam10/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/msi/ms9652_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9652_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "MSI ";
Modified: trunk/src/mainboard/msi/ms9652_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/msi/ms9652_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -212,9 +212,9 @@
val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x\n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x\n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/newisys/khepri/mptable.c ============================================================================== --- trunk/src/mainboard/newisys/khepri/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/newisys/khepri/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "NEWISYS ";
Modified: trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/nvidia/l1_2pvv/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/nvidia/l1_2pvv/mptable.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/nvidia/l1_2pvv/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "NVIDIA ";
Modified: trunk/src/mainboard/nvidia/l1_2pvv/romstage.c ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/nvidia/l1_2pvv/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -218,7 +218,7 @@ early_usbdebug_direct_init(); #endif console_init(); - print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/olpc/btest/mainboard.c ============================================================================== --- trunk/src/mainboard/olpc/btest/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/olpc/btest/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -61,7 +61,7 @@ /* Enable the DCON */ ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069); if (ret != 0) - printk(BIOS_DEBUG, "DCON ENABLE FAILED\n", ret); + printk(BIOS_DEBUG, "DCON ENABLE FAILED %d\n", ret); } else printk(BIOS_DEBUG, "DCON NOT FOUND (%x)\n", rev);
Modified: trunk/src/mainboard/olpc/rev_a/mainboard.c ============================================================================== --- trunk/src/mainboard/olpc/rev_a/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/olpc/rev_a/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -60,7 +60,7 @@ /* Enable the DCON */ ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069); if (ret != 0) - printk(BIOS_DEBUG, "DCON ENABLE FAILED\n", ret); + printk(BIOS_DEBUG, "DCON ENABLE FAILED %d\n", ret); } else printk(BIOS_DEBUG, "DCON NOT FOUND (%x)\n", rev);
Modified: trunk/src/mainboard/rca/rm4100/mainboard_smi.c ============================================================================== --- trunk/src/mainboard/rca/rm4100/mainboard_smi.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/rca/rm4100/mainboard_smi.c Mon Mar 22 17:33:25 2010 (r5268) @@ -22,6 +22,7 @@ #include <arch/io.h> #include <arch/romcc_io.h> #include <console/console.h> +#include <cpu/x86/smm.h>
int mainboard_io_trap_handler(int smif) {
Modified: trunk/src/mainboard/sunw/ultra40/irq_tables.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/sunw/ultra40/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -71,7 +71,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/sunw/ultra40/mptable.c ============================================================================== --- trunk/src/mainboard/sunw/ultra40/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/sunw/ultra40/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -34,7 +34,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "SUNW ";
Modified: trunk/src/mainboard/supermicro/h8dme/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dme/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -75,7 +75,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/supermicro/h8dme/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dme/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -35,7 +35,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "SUPERMIC";
Modified: trunk/src/mainboard/supermicro/h8dme/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dme/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -270,11 +270,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); - print_debug_hex32(sysinfo); - print_debug(","); - print_debug_hex32((unsigned long)sysinfo + sizeof(struct sys_info)); - print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_mb_resource_map();
Modified: trunk/src/mainboard/supermicro/h8dmr/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -75,7 +75,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/supermicro/h8dmr/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -35,7 +35,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "SUPERMIC";
Modified: trunk/src/mainboard/supermicro/h8dmr/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -203,7 +203,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
- print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
setup_mb_resource_map();
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be between 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "SUPERMIC";
Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -205,9 +205,9 @@
val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x \n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x \n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8qme_fam10/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be between 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8qme_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -32,7 +32,7 @@ extern void get_bus_conf(void); extern unsigned sbdn3;
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "SUPERMIC";
Modified: trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/h8qme_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -248,9 +248,9 @@
val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x \n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x \n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x \n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/supermicro/x6dai_g/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dai_g/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/supermicro/x6dai_g/reset.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dai_g/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -24,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_6300ESB_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/supermicro/x6dhe_g/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhe_g/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/supermicro/x6dhe_g/reset.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhe_g/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -24,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/supermicro/x6dhe_g2/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhe_g2/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/supermicro/x6dhe_g2/reset.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhe_g2/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -24,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/supermicro/x6dhr_ig/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhr_ig/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/supermicro/x6dhr_ig/reset.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhr_ig/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -24,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/mptable.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/reset.c ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,4 +1,5 @@ #include <arch/io.h> +#include <reset.h> #include <device/pci_def.h> #include <device/pci_ids.h> #if !defined (__ROMCC__) && !defined (__PRE_RAM__) @@ -24,19 +25,3 @@ outb(0x02, 0xcf9); outb(0x06, 0xcf9); } -void full_reset(void) -{ - device_t dev; - /* Enable power on after power fail... */ - dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801ER_LPC), 0); - if (dev != PCI_DEV_INVALID) { - unsigned byte; - byte = pci_read_config8(dev, 0xa4); - byte &= 0xfe; - pci_write_config8(dev, 0xa4, byte); - - } - outb(0x0e, 0xcf9); -} - -
Modified: trunk/src/mainboard/technexion/tim5690/mptable.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/technexion/tim5690/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "ATI ";
Modified: trunk/src/mainboard/technexion/tim5690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim5690/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/technexion/tim5690/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -198,7 +198,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr);
fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr);
Modified: trunk/src/mainboard/technexion/tim8690/mptable.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/technexion/tim8690/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -38,7 +38,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "ATI ";
Modified: trunk/src/mainboard/technexion/tim8690/romstage.c ============================================================================== --- trunk/src/mainboard/technexion/tim8690/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/technexion/tim8690/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -190,7 +190,7 @@ allow_all_aps_stop(bsp_apicid);
/* It's the time to set ctrl now; */ - printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %2x spd_addr: %2x\n", + printk(BIOS_DEBUG, "sysinfo->nodes: %2x sysinfo->ctrl: %p spd_addr: %p\n", sysinfo->nodes, sysinfo->ctrl, spd_addr); fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);
Modified: trunk/src/mainboard/technologic/ts5300/mainboard.c ============================================================================== --- trunk/src/mainboard/technologic/ts5300/mainboard.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/technologic/ts5300/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -7,7 +7,8 @@ #include "chip.h"
-static void irqdump() +#if 0 +static void irqdump(void) { volatile unsigned char *irq; void *mmcr; @@ -26,16 +27,16 @@ printk(BIOS_ERR, "mmcr is %p\n", mmcr); for(i = 0; irqlist[i] >= 0; i++) { irq = mmcr + irqlist[i]; - printk(BIOS_ERR, "0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq); + printk(BIOS_ERR, "0x%x register @%p is 0x%x\n", irqlist[i], irq, *irq); }
} +#endif
/* TODO: finish up mmcr struct in sc520.h, and; - set ADDDECTL (now done in raminit.c in cpu/amd/sc520 */ static void enable_dev(struct device *dev) { - volatile struct mmcrpic *pic = MMCRPIC; volatile struct mmcr *mmcr = MMCRDEFAULT;
/* currently, nothing in the device to use, so ignore it. */
Modified: trunk/src/mainboard/tyan/s2735/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2735/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2735/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -4,7 +4,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2850/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2850/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2850/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -43,7 +43,7 @@ }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2875/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2875/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2875/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -41,7 +41,7 @@ return 0; }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2880/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2880/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2880/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -43,7 +43,7 @@ }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2881/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2881/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -58,7 +58,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2881/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2881/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2881/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -20,7 +20,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2882/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2882/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -158,7 +158,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...\n", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...\n", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2882/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2882/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2882/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -43,7 +43,7 @@ return 0; }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2885/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2885/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -61,7 +61,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2885/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2885/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2885/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -24,7 +24,7 @@ extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2891/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2891/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -67,7 +67,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2891/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2891/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2891/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -24,7 +24,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2912/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2912/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2912/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -214,7 +214,7 @@ early_usbdebug_direct_init(); #endif console_init(); - print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
Modified: trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912_fam10/irq_tables.c Mon Mar 22 17:33:25 2010 (r5268) @@ -76,7 +76,7 @@ addr &= ~15;
/* This table must be betweeen 0xf0000 & 0x100000 */ - printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr); + printk(BIOS_INFO, "Writing IRQ routing tables to 0x%lx...", addr);
pirq = (void *)(addr); v = (uint8_t *)(addr);
Modified: trunk/src/mainboard/tyan/s2912_fam10/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912_fam10/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -31,7 +31,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s2912_fam10/romstage.c ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/romstage.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s2912_fam10/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -210,9 +210,9 @@
val = cpuid_eax(1); printk(BIOS_DEBUG, "BSP Family_Model: %08x\n", val); - printk(BIOS_DEBUG, "*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n"); + printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1); printk(BIOS_DEBUG, "bsp_apicid = %02x\n", bsp_apicid); - printk(BIOS_DEBUG, "cpu_init_detectedx = %08x\n", cpu_init_detectedx); + printk(BIOS_DEBUG, "cpu_init_detectedx = %08lx\n", cpu_init_detectedx);
/* Setup sysinfo defaults */ set_sysinfo_in_ram(0);
Modified: trunk/src/mainboard/tyan/s4880/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s4880/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s4880/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -41,7 +41,7 @@ return 0; }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/tyan/s4882/mptable.c ============================================================================== --- trunk/src/mainboard/tyan/s4882/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/tyan/s4882/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -42,7 +42,7 @@ return 0; }
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "TYAN ";
Modified: trunk/src/mainboard/via/epia-m/vgabios.c ============================================================================== --- trunk/src/mainboard/via/epia-m/vgabios.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/via/epia-m/vgabios.c Mon Mar 22 17:33:25 2010 (r5268) @@ -371,7 +371,7 @@ buf = (unsigned char *) 0xc0000; if (buf[0]==0x55 && buf[1]==0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn);
real_mode_switch_call_vga(busdevfn); } else @@ -567,14 +567,14 @@ eax, ebx, ecx, edx); printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%lx cs 0x%lx flags 0x%lx\n", ip, cs, flags);
// cases in a good compiler are just as good as your own tables. switch (intnumber) { case 0 ... 15: // These are not BIOS service, but the CPU-generated exceptions - printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber); if (esp < 0x1000) { printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { @@ -602,8 +602,7 @@ &ebx, &edx, &ecx, &eax, &flags); break; default: - printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", - intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber); break; } if (ret)
Modified: trunk/src/mainboard/via/epia-n/mptable.c ============================================================================== --- trunk/src/mainboard/via/epia-n/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/via/epia-n/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -6,7 +6,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "LNXI ";
Modified: trunk/src/mainboard/via/pc2500e/mptable.c ============================================================================== --- trunk/src/mainboard/via/pc2500e/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/via/pc2500e/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -32,7 +32,7 @@
#define bus_isa 2
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "VIA ";
Modified: trunk/src/mainboard/via/vt8454c/mptable.c ============================================================================== --- trunk/src/mainboard/via/vt8454c/mptable.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/mainboard/via/vt8454c/mptable.c Mon Mar 22 17:33:25 2010 (r5268) @@ -27,7 +27,7 @@ #include <string.h> #include <stdint.h>
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = MPC_SIGNATURE; static const char oem[8] = "COREBOOT";
Modified: trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Mon Mar 22 17:33:25 2010 (r5268) @@ -89,7 +89,7 @@ basek = resk(res->base); sizek = resk(res->size);
- printk(BIOS_DEBUG, "set_srat_mem: dev %s, res->index=%04x startk=%08x, sizek=%08x\n", + printk(BIOS_DEBUG, "set_srat_mem: dev %s, res->index=%04lx startk=%08lx, sizek=%08lx\n", dev_path(dev), res->index, basek, sizek); /* * 0-640K must be on node 0
Modified: trunk/src/northbridge/amd/amdfam10/debug.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/debug.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/amdfam10/debug.c Mon Mar 22 17:33:25 2010 (r5268) @@ -28,7 +28,7 @@ static void print_debug_addr(const char *str, void *val) { #if CACHE_AS_RAM_ADDRESS_DEBUG == 1 - printk(BIOS_DEBUG, "------Address debug: %s%x------\n", str, val); + printk(BIOS_DEBUG, "------Address debug: %s%p------\n", str, val); #endif }
Modified: trunk/src/northbridge/amd/amdfam10/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/amdfam10/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/amdfam10/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1086,7 +1086,7 @@ ram_resource(dev, (idx | i), basek, sizek); idx += 0x10; #if CONFIG_WRITE_HIGH_TABLES==1 - printk(BIOS_DEBUG, "%d: mmio_basek=%08lx, basek=%08x, limitk=%08x\n", + printk(BIOS_DEBUG, "%d: mmio_basek=%08lx, basek=%08llx, limitk=%08llx\n", i, mmio_basek, basek, limitk); if (i==0 && high_tables_base==0) { /* Leave some space for ACPI, PIRQ and MP tables */
Modified: trunk/src/northbridge/amd/amdk8/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/amdk8/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1005,7 +1005,7 @@
#if CONFIG_GFXUMA == 1 - printk(BIOS_DEBUG, "node %d : uma_memory_base/1024=0x%08x, mmio_basek=0x%08x, basek=0x%08x, limitk=0x%08x\n", i, uma_memory_base >> 10, mmio_basek, basek, limitk); + printk(BIOS_DEBUG, "node %d : uma_memory_base/1024=0x%08llx, mmio_basek=0x%08lx, basek=0x%08x, limitk=0x%08x\n", i, uma_memory_base >> 10, mmio_basek, basek, limitk); if ((uma_memory_base >> 10) < mmio_basek) printk(BIOS_ALERT, "node %d: UMA memory starts below mmio_basek\n", i); #else
Modified: trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c ============================================================================== --- trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/amdk8/raminit_f_dqs.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1700,7 +1700,7 @@ } sizek = 1 << align; #if CONFIG_MEM_TRAIN_SEQ != 1 - printk(BIOS_DEBUG, "Setting variable MTRR %d, base: %4dMB, range: %4dMB, type %s\r\n", + printk(BIOS_DEBUG, "Setting variable MTRR %d, base: %4ldMB, range: %4ldMB, type %s\r\n", reg, range_startk >>10, sizek >> 10, (type==MTRR_TYPE_UNCACHEABLE)?"UC": ((type==MTRR_TYPE_WRBACK)?"WB":"Other")
Modified: trunk/src/northbridge/amd/gx2/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/gx2/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/gx2/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -127,7 +127,7 @@ /* Set up IRQ steering */ uint32_t pciAddr = 0x80000000 | (CHIPSET_DEV_NUM << 11) | 0x5C;
- printk(BIOS_DEBUG, "%s(%08X [%08X], %04X)\n", __func__, dev, pciAddr, irq_map); + printk(BIOS_DEBUG, "%s(%p [%08X], %04X)\n", __func__, dev, pciAddr, irq_map);
/* The IRQ steering values (in hex) are effectively dcba, where: * <a> represents the IRQ for INTA, @@ -240,7 +240,7 @@ /* calculate the PBASE and PMASK fields */ tmp2 = (SMM_OFFSET << 8) & 0xFFF00000; /* shift right 12 then left 20 == left 8 */ tmp2 |= (((~(SMM_SIZE * 1024) + 1) >> 12) & 0xfffff); - printk(BIOS_DEBUG, "MSR 0x%x is now 0x%x:0x%x\n", 0x10000026, tmp, tmp2); + printk(BIOS_DEBUG, "MSR 0x%x is now 0x%lx:0x%lx\n", 0x10000026, tmp, tmp2); msr.hi = tmp; msr.lo = tmp2; wrmsr(0x10000026, msr);
Modified: trunk/src/northbridge/amd/gx2/northbridgeinit.c ============================================================================== --- trunk/src/northbridge/amd/gx2/northbridgeinit.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/gx2/northbridgeinit.c Mon Mar 22 17:33:25 2010 (r5268) @@ -112,10 +112,10 @@ msr.lo = gl->lo; msr.hi = gl->hi; wrmsr(gl->desc_name, msr); // MSR - see table above - printk(BIOS_DEBUG, "%s: write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); /* they do this, so we do this */ msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); }
static void @@ -164,7 +164,7 @@ msr.lo = sizebytes; wrmsr(gl->desc_name, msr); // MSR - see table above msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } @@ -181,7 +181,7 @@
sizebytes -= DMM_SIZE*1024; offset = sizebytes - DMM_OFFSET; - printk(BIOS_DEBUG, "%s: offset is 0x%08x\n", __func__, offset); + printk(BIOS_DEBUG, "%s: offset is 0x%08lx\n", __func__, offset); offset >>= 12; msr.hi = (gl->hi) | (offset << 8); /* I don't think this is needed */ @@ -192,7 +192,7 @@ wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void @@ -215,7 +215,7 @@ wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void SMMGL0Init(struct gliutable *gl) { @@ -231,7 +231,7 @@ printk(BIOS_DEBUG, "%s: %d bytes\n", __func__, sizebytes);
offset = sizebytes - SMM_OFFSET; - printk(BIOS_DEBUG, "%s: offset is 0x%08x\n", __func__, offset); + printk(BIOS_DEBUG, "%s: offset is 0x%08lx\n", __func__, offset); offset >>= 12;
msr.hi = offset << 8; @@ -242,7 +242,7 @@ wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); } static void SMMGL1Init(struct gliutable *gl) { @@ -258,7 +258,7 @@ wrmsr(gl->desc_name, msr); // MSR - See table above msr = rdmsr(gl->desc_name); - printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: AFTER write msr 0x%08lx, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo); }
static void @@ -507,10 +507,10 @@
for(i = 0; gating->msrnum != 0xffffffff; i++) { msr = rdmsr(gating->msrnum); - printk(BIOS_DEBUG, "%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: MSR 0x%08lx is 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); msr.hi |= gating->msr.hi; msr.lo |= gating->msr.lo; - printk(BIOS_DEBUG, "%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, + printk(BIOS_DEBUG, "%s: MSR 0x%08lx will be set to 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo); wrmsr(gating->msrnum, msr); // MSR - See the table above gating +=1; @@ -526,11 +526,11 @@
for(i = 0; prio->msrnum != 0xffffffff; i++) { msr = rdmsr(prio->msrnum); - printk(BIOS_DEBUG, "%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); + printk(BIOS_DEBUG, "%s: MSR 0x%08lx is 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); msr.hi |= prio->msr.hi; msr.lo &= ~0xfff; msr.lo |= prio->msr.lo; - printk(BIOS_DEBUG, "%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, + printk(BIOS_DEBUG, "%s: MSR 0x%08lx will be set to 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo); wrmsr(prio->msrnum, msr); // MSR - See the table above prio +=1;
Modified: trunk/src/northbridge/amd/lx/northbridge.c ============================================================================== --- trunk/src/northbridge/amd/lx/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/amd/lx/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -341,7 +341,7 @@ bus = &dev->link[link]; if (bus->children) { printk(BIOS_DEBUG, "my_dev_set_resources: assign_resources %d\n", - bus); + bus->secondary); assign_resources(bus); } }
Modified: trunk/src/northbridge/intel/i3100/pciexp_porta_ep80579.c ============================================================================== --- trunk/src/northbridge/intel/i3100/pciexp_porta_ep80579.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/intel/i3100/pciexp_porta_ep80579.c Mon Mar 22 17:33:25 2010 (r5268) @@ -56,7 +56,6 @@
static void pcie_bus_enable_resources(struct device *dev) { - u8 val8; if (dev->link[0].bridge_ctrl & PCI_BRIDGE_CTL_VGA) { printk(BIOS_SPEW, "Enable VGA IO/MEM forwarding on PCIe port\n"); pci_write_config8(dev, PCI_BRIDGE_CONTROL, 8);
Modified: trunk/src/northbridge/intel/i82810/northbridge.c ============================================================================== --- trunk/src/northbridge/intel/i82810/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/intel/i82810/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -142,7 +142,7 @@ drp_value = drp_value >> 4; // >>= 4; //? mess with later tomk += (unsigned long)(translate_i82810_to_mb[drp_value]);
- printk(BIOS_DEBUG, "Setting RAM size to %d MB\n", tomk); + printk(BIOS_DEBUG, "Setting RAM size to %ld MB\n", tomk);
/* Convert tomk from MB to KB. */ tomk = tomk << 10;
Modified: trunk/src/northbridge/intel/i855/northbridge.c ============================================================================== --- trunk/src/northbridge/intel/i855/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/intel/i855/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -29,6 +29,7 @@ #include <string.h> #include <bitops.h> #include <cpu/x86/cache.h> +#include <cpu/cpu.h> #include "chip.h"
static void ram_resource(device_t dev, unsigned long index, @@ -95,9 +96,7 @@ * too confusing to get right. Kilobytes are good up to * 4 Terabytes of RAM... */ - uint16_t tolm_r, vga_mem; unsigned long tomk, tolmk; - unsigned long remapbasek, remaplimitk; int idx;
/* Get the value of the highest DRB. This tells the end of @@ -120,8 +119,8 @@ */ /* Report the memory regions */ - printk(BIOS_DEBUG, "tomk = %d\n", tomk); - printk(BIOS_DEBUG, "tolmk = %d\n", tolmk); + printk(BIOS_DEBUG, "tomk = %ld\n", tomk); + printk(BIOS_DEBUG, "tolmk = %ld\n", tolmk);
idx = 10; /* avoid pam region */ @@ -165,8 +164,6 @@
static void enable_dev(struct device *dev) { - struct device_path path; - /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { dev->ops = &pci_domain_ops;
Modified: trunk/src/northbridge/via/cn400/northbridge.c ============================================================================== --- trunk/src/northbridge/via/cn400/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/cn400/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -244,7 +244,7 @@ tomk = rambits * 32 * 1024; /* Compute the Top Of Low Memory (TOLM), in Kb. */ tolmk = pci_tolm >> 10; - printk(BIOS_SPEW, "tomk is 0x%x, tolmk is 0x%08X\n", tomk, tolmk); + printk(BIOS_SPEW, "tomk is 0x%lx, tolmk is 0x%08lX\n", tomk, tolmk); if (tolmk >= tomk) { /* The PCI hole does does not overlap the memory. */ tolmk = tomk;
Modified: trunk/src/northbridge/via/cn400/vgabios.c ============================================================================== --- trunk/src/northbridge/via/cn400/vgabios.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/cn400/vgabios.c Mon Mar 22 17:33:25 2010 (r5268) @@ -371,7 +371,7 @@ buf = (unsigned char *) 0xc0000; if (buf[0]==0x55 && buf[1]==0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn);
real_mode_switch_call_vga(busdevfn); } else @@ -567,14 +567,14 @@ eax, ebx, ecx, edx); printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%lx cs 0x%lx flags 0x%lx\n", ip, cs, flags);
// cases in a good compiler are just as good as your own tables. switch (intnumber) { case 0 ... 15: // These are not BIOS service, but the CPU-generated exceptions - printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber); if (esp < 0x1000) { printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { @@ -602,8 +602,7 @@ &ebx, &edx, &ecx, &eax, &flags); break; default: - printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", - intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber); break; } if (ret)
Modified: trunk/src/northbridge/via/cn700/northbridge.c ============================================================================== --- trunk/src/northbridge/via/cn700/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/cn700/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -177,7 +177,7 @@ }
tomk = rambits * 64 * 1024; - printk(BIOS_SPEW, "tomk is 0x%x\n", tomk); + printk(BIOS_SPEW, "tomk is 0x%lx\n", tomk); /* Compute the Top Of Low Memory (TOLM), in Kb. */ tolmk = pci_tolm >> 10; if (tolmk >= tomk) {
Modified: trunk/src/northbridge/via/cn700/vgabios.c ============================================================================== --- trunk/src/northbridge/via/cn700/vgabios.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/cn700/vgabios.c Mon Mar 22 17:33:25 2010 (r5268) @@ -371,7 +371,7 @@ buf = (unsigned char *) 0xc0000; if (buf[0]==0x55 && buf[1]==0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn);
real_mode_switch_call_vga(busdevfn); } else @@ -567,14 +567,14 @@ eax, ebx, ecx, edx); printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%lx cs 0x%lx flags 0x%lx\n", ip, cs, flags);
// cases in a good compiler are just as good as your own tables. switch (intnumber) { case 0 ... 15: // These are not BIOS service, but the CPU-generated exceptions - printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber); if (esp < 0x1000) { printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { @@ -602,8 +602,7 @@ &ebx, &edx, &ecx, &eax, &flags); break; default: - printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", - intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber); break; } if (ret)
Modified: trunk/src/northbridge/via/cx700/vgabios.c ============================================================================== --- trunk/src/northbridge/via/cx700/vgabios.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/cx700/vgabios.c Mon Mar 22 17:33:25 2010 (r5268) @@ -339,7 +339,7 @@ if (buf[0] == 0x55 && buf[1] == 0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn);
real_mode_switch_call_vga(busdevfn); } else @@ -517,14 +517,14 @@ eax, ebx, ecx, edx); printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%lx cs 0x%lx flags 0x%lx\n", ip, cs, flags);
// cases in a good compiler are just as good as your own tables. switch (intnumber) { case 0 ... 15: // These are not BIOS service, but the CPU-generated exceptions - printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber); if (esp < 0x1000) { printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { @@ -552,7 +552,7 @@ &ebx, &edx, &ecx, &eax, &flags); break; default: - printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber); break; } if (ret)
Modified: trunk/src/northbridge/via/vt8623/northbridge.c ============================================================================== --- trunk/src/northbridge/via/vt8623/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/vt8623/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -48,7 +48,7 @@ */ //fb = pci_read_config32(dev, 0x10); /* Base addres of framebuffer */ fb = 0xd0000000; - printk(BIOS_DEBUG, "Frame buffer at %8x\n",fb); + printk(BIOS_DEBUG, "Frame buffer at %8lx\n",fb);
c = pci_read_config8(dev, 0xe1) & 0xf0; /* size of vga */ c |= fb>>28; /* upper nibble of frame buffer address */
Modified: trunk/src/northbridge/via/vx800/northbridge.c ============================================================================== --- trunk/src/northbridge/via/vx800/northbridge.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/vx800/northbridge.c Mon Mar 22 17:33:25 2010 (r5268) @@ -162,7 +162,7 @@ (((rambits << 6) - (4 << reg) - VIACONFIG_TOP_SM_SIZE_MB) * 1024);
- printk(BIOS_SPEW, "tomk is 0x%x\n", tomk); + printk(BIOS_SPEW, "tomk is 0x%lx\n", tomk); /* Compute the Top Of Low Memory, in Kb */ tolmk = pci_tolm >> 10; if (tolmk >= tomk) {
Modified: trunk/src/northbridge/via/vx800/vgabios.c ============================================================================== --- trunk/src/northbridge/via/vx800/vgabios.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/northbridge/via/vx800/vgabios.c Mon Mar 22 17:33:25 2010 (r5268) @@ -338,7 +338,7 @@ if (buf[0] == 0x55 && buf[1] == 0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#lx\n", busdevfn); real_mode_switch_call_vga(busdevfn); } else printk(BIOS_DEBUG, "Failed to copy VGA BIOS to 0xc0000\n"); @@ -518,7 +518,7 @@ eax, ebx, ecx, edx); printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%lx cs 0x%lx flags 0x%lx\n", ip, cs, flags);
// cases in a good compiler are just as good as your own tables. @@ -527,7 +527,7 @@ case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: // These are not BIOS service, but the CPU-generated exceptions - printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %lu\n", intnumber); if (esp < 0x1000) { printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { @@ -556,7 +556,7 @@ &ebx, &edx, &ecx, &eax, &flags); break; default: - printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%lx\n", intnumber); break; } if (ret)
Modified: trunk/src/southbridge/amd/rs780/rs780_pcie.c ============================================================================== --- trunk/src/southbridge/amd/rs780/rs780_pcie.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/amd/rs780/rs780_pcie.c Mon Mar 22 17:33:25 2010 (r5268) @@ -255,7 +255,7 @@ u32 gfx_gpp_sb_sel; struct southbridge_amd_rs780_config *cfg = (struct southbridge_amd_rs780_config *)nb_dev->chip_info; - printk(BIOS_DEBUG, "gpp_sb_init nb_dev=0x%p, dev=0x%p, port=0x%p\n", nb_dev, dev, port); + printk(BIOS_DEBUG, "gpp_sb_init nb_dev=0x%x, dev=0x%x, port=0x%x\n", nb_dev->path.pci.devfn, dev->path.pci.devfn, port);
gfx_gpp_sb_sel = port >= 4 && port <= 8 ? PCIE_CORE_INDEX_GPPSB : /* 4,5,6,7,8 */
Modified: trunk/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c ============================================================================== --- trunk/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c Mon Mar 22 17:33:25 2010 (r5268) @@ -86,7 +86,7 @@ if(!(res->flags & IORESOURCE_IO)) continue; base = res->base; end = resource_end(res); - printk(BIOS_DEBUG, "bcm5785lpc decode:%s, base=0x%08x, end=0x%08x\r\n",dev_path(child),base, end); + printk(BIOS_DEBUG, "bcm5785lpc decode:%s, base=0x%08lx, end=0x%08lx\r\n",dev_path(child),base, end); switch(base) { case 0x60: //KBC case 0x64:
Modified: trunk/src/southbridge/intel/i3100/i3100_lpc.c ============================================================================== --- trunk/src/southbridge/intel/i3100/i3100_lpc.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/intel/i3100/i3100_lpc.c Mon Mar 22 17:33:25 2010 (r5268) @@ -317,7 +317,7 @@ if (!res) { return; } - *((u8 *)(res->base + 0x31ff)) |= (1 << 0); + *((u8 *)((u32)res->base + 0x31ff)) |= (1 << 0);
// TODO this code sets int 0 of the IOAPIC in Virtual Wire Mode // (register 0x10/0x11) while the old code used int 1 (register 0x12)
Modified: trunk/src/southbridge/intel/i3100/i3100_reset.c ============================================================================== --- trunk/src/southbridge/intel/i3100/i3100_reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/intel/i3100/i3100_reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -19,6 +19,7 @@ */
#include <arch/io.h> +#include <reset.h>
void hard_reset(void) {
Modified: trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c ============================================================================== --- trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/intel/i82801ax/i82801ax_lpc.c Mon Mar 22 17:33:25 2010 (r5268) @@ -74,7 +74,7 @@ * specific IRQ values in your mainboards Config.lb. */
-void i82801ax_enable_apic(struct device *dev) +static void i82801ax_enable_apic(struct device *dev) { uint32_t reg32; volatile uint32_t *ioapic_index = (volatile uint32_t *)0xfec00000; @@ -108,7 +108,7 @@ *ioapic_data = 1; /* Use Processor System Bus to deliver interrupts. */ }
-void i82801ax_enable_serial_irqs(struct device *dev) +static void i82801ax_enable_serial_irqs(struct device *dev) { /* Set packet length and toggle silent mode bit. */ pci_write_config8(dev, SERIRQ_CNTL, @@ -220,7 +220,7 @@ } }
-void i82801ax_rtc_init(struct device *dev) +static void i82801ax_rtc_init(struct device *dev) { uint8_t reg8; uint32_t reg32; @@ -240,7 +240,7 @@ pci_write_config8(dev, RTC_CONF, 0x04); }
-void i82801ax_lpc_route_dma(struct device *dev, uint8_t mask) +static void i82801ax_lpc_route_dma(struct device *dev, uint8_t mask) { uint16_t reg16; int i;
Modified: trunk/src/southbridge/intel/i82801ex/i82801ex_reset.c ============================================================================== --- trunk/src/southbridge/intel/i82801ex/i82801ex_reset.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/intel/i82801ex/i82801ex_reset.c Mon Mar 22 17:33:25 2010 (r5268) @@ -1,6 +1,7 @@ #include <arch/io.h> +#include <reset.h>
-void i82801ex_hard_reset(void) +void hard_reset(void) { /* Try rebooting through port 0xcf9 */ outb((0 <<3)|(1<<2)|(1<<1), 0xcf9);
Modified: trunk/src/southbridge/intel/i82870/p64h2_ioapic.c ============================================================================== --- trunk/src/southbridge/intel/i82870/p64h2_ioapic.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/intel/i82870/p64h2_ioapic.c Mon Mar 22 17:33:25 2010 (r5268) @@ -62,7 +62,7 @@ pIndexRegister = (volatile uint32_t*) memoryBase; pWindowRegister = (volatile uint32_t*)(memoryBase + 0x10);
- printk(BIOS_DEBUG, "IOAPIC %d at %02x:%02x.%01x MBAR = %x DataAddr = %x\n", + printk(BIOS_DEBUG, "IOAPIC %d at %02x:%02x.%01x MBAR = %p DataAddr = %p\n", apic_id, dev->bus->secondary, PCI_SLOT(dev->path.pci.devfn), PCI_FUNC(dev->path.pci.devfn), pIndexRegister, pWindowRegister);
Modified: trunk/src/southbridge/nvidia/ck804/ck804_nic.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_nic.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/nvidia/ck804/ck804_nic.c Mon Mar 22 17:33:25 2010 (r5268) @@ -18,11 +18,11 @@ int eeprom_valid = 0; struct southbridge_nvidia_ck804_config *conf; static uint32_t nic_index = 0; - uint8_t *base; + unsigned long base; struct resource *res;
res = find_resource(dev, 0x10); - base = (uint8_t*)(unsigned long)res->base; + base = (unsigned long)res->base;
#define NvRegPhyInterface 0xC0 #define PHY_RGMII 0x10000000 @@ -76,8 +76,8 @@ if (!eeprom_valid) { unsigned long mac_pos; mac_pos = 0xffffffd0; /* See romstrap.inc and romstrap.lds. */ - mac_l = read32((uint8_t*)mac_pos) + nic_index; - mac_h = read32((uint8_t*)mac_pos + 4); + mac_l = read32(mac_pos) + nic_index; + mac_h = read32(mac_pos + 4); } #if 1 /* Set that into NIC MMIO. */
Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_aza.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_aza.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_aza.c Mon Mar 22 17:33:25 2010 (r5268) @@ -230,7 +230,7 @@ return;
base =(uint8_t *) res->base; - printk(BIOS_DEBUG, "base = %08x\n", base); + printk(BIOS_DEBUG, "base = %p\n", base);
codec_mask = codec_detect(base);
Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c Mon Mar 22 17:33:25 2010 (r5268) @@ -80,7 +80,7 @@
pci_write_config32(dev,0x44, 0xfed00001); hpet_address=pci_read_config32(dev,0x44)& 0xfffffffe; - printk(BIOS_DEBUG, "enabling HPET @0x%x\n", hpet_address); + printk(BIOS_DEBUG, "enabling HPET @0x%lx\n", hpet_address); }
static void lpc_init(device_t dev) @@ -224,7 +224,7 @@ if(!(res->flags & IORESOURCE_IO)) continue; base = res->base; end = resource_end(res); - printk(BIOS_DEBUG, "mcp55 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end); + printk(BIOS_DEBUG, "mcp55 lpc decode:%s, base=0x%08lx, end=0x%08lx\n",dev_path(child),base, end); switch(base) { case 0x3f8: // COM1 reg |= (1<<0); break;
Modified: trunk/src/southbridge/ricoh/rl5c476/rl5c476.c ============================================================================== --- trunk/src/southbridge/ricoh/rl5c476/rl5c476.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/ricoh/rl5c476/rl5c476.c Mon Mar 22 17:33:25 2010 (r5268) @@ -189,7 +189,7 @@ resource = find_resource(dev,1); if( !(resource->flags & IORESOURCE_STORED) ){ resource->flags |= IORESOURCE_STORED ; - printk(BIOS_DEBUG, "%s 1 ==> %x\n", dev_path(dev), resource->base); + printk(BIOS_DEBUG, "%s 1 ==> %llx\n", dev_path(dev), resource->base); cf_base = resource->base; } }
Modified: trunk/src/southbridge/sis/sis966/sis966_aza.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_aza.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/sis/sis966/sis966_aza.c Mon Mar 22 17:33:25 2010 (r5268) @@ -117,7 +117,7 @@ return 0; }
- printk(BIOS_DEBUG, "Codec ID = %lx\n", dword); + printk(BIOS_DEBUG, "Codec ID = %x\n", dword);
dword=0x1; return dword; @@ -293,7 +293,7 @@ return;
base =(uint8_t *) res->base; - printk(BIOS_DEBUG, "base = %08x\n", base); + printk(BIOS_DEBUG, "base = %p\n", base);
codec_mask = codec_detect(base);
Modified: trunk/src/southbridge/sis/sis966/sis966_early_smbus.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_early_smbus.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/sis/sis966/sis966_early_smbus.c Mon Mar 22 17:33:25 2010 (r5268) @@ -484,7 +484,7 @@ printk(BIOS_DEBUG, "Init NorthBridge sis761 -------->\n"); dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_SIS, PCI_DEVICE_ID_SIS_SIS761), 0); msr = rdmsr(0xC001001A); - printk(BIOS_DEBUG, "Memory Top Bound %lx\n",msr.lo ); + printk(BIOS_DEBUG, "Memory Top Bound %x\n",msr.lo );
temp16=(pci_read_config8(dev, 0x4C) & 0xE0) >> 5; temp16=0x0001<<(temp16-1);
Modified: trunk/src/southbridge/sis/sis966/sis966_lpc.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_lpc.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/sis/sis966/sis966_lpc.c Mon Mar 22 17:33:25 2010 (r5268) @@ -214,7 +214,7 @@ if(!(res->flags & IORESOURCE_IO)) continue; base = res->base; end = resource_end(res); - printk(BIOS_DEBUG, "sis966 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end); + printk(BIOS_DEBUG, "sis966 lpc decode:%s, base=0x%08lx, end=0x%08lx\n",dev_path(child),base, end); switch(base) { case 0x3f8: // COM1 reg |= (1<<0); break;
Modified: trunk/src/southbridge/sis/sis966/sis966_nic.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_nic.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/sis/sis966/sis966_nic.c Mon Mar 22 17:33:25 2010 (r5268) @@ -274,7 +274,7 @@ return; } base = res->base; - printk(BIOS_DEBUG, "NIC base address %lx\n",base); + printk(BIOS_DEBUG, "NIC base address %x\n",base);
if(!(val=phy_detect(base,&PhyAddr))) { @@ -291,7 +291,7 @@
// if that is valid we will use that
- printk(BIOS_DEBUG, "EEPROM contents %x \n",ReadEEprom( dev, base, 0LL)); + printk(BIOS_DEBUG, "EEPROM contents %lx \n",ReadEEprom( dev, base, 0LL)); for(i=0;i<3;i++) { //status = smbus_read_byte(dev_eeprom, i); ulValue=ReadEEprom( dev, base, i+3L);
Modified: trunk/src/southbridge/sis/sis966/sis966_usb2.c ============================================================================== --- trunk/src/southbridge/sis/sis966/sis966_usb2.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/southbridge/sis/sis966/sis966_usb2.c Mon Mar 22 17:33:25 2010 (r5268) @@ -95,7 +95,7 @@ return;
base =(uint8_t *) res->base; - printk(BIOS_DEBUG, "base = %08x\n", base); + printk(BIOS_DEBUG, "base = %p\n", base); write32(base+0x20, 0x2); //-----------------------------------------------------------
Modified: trunk/src/superio/via/vt1211/vt1211.c ============================================================================== --- trunk/src/superio/via/vt1211/vt1211.c Mon Mar 22 12:50:52 2010 (r5267) +++ trunk/src/superio/via/vt1211/vt1211.c Mon Mar 22 17:33:25 2010 (r5268) @@ -148,7 +148,7 @@ for(i = 0; i < dev->resources; i++) { resource = &dev->resource[i]; if (!(resource->flags & IORESOURCE_ASSIGNED)) { - printk(BIOS_ERR, "ERROR: %s %02x %s size: 0x%010Lx not assigned\n", + printk(BIOS_ERR, "ERROR: %s %02lx %s size: 0x%010Lx not assigned\n", dev_path(dev), dev->resource->index, resource_type(resource), resource->size); @@ -166,7 +166,7 @@ pnp_set_irq(dev, resource->index, resource->base); } else { - printk(BIOS_ERR, "ERROR: %s %02x unknown resource type\n", + printk(BIOS_ERR, "ERROR: %s %02lx unknown resource type\n", dev_path(dev), resource->index); return; }
repository service wrote:
+++ trunk/src/cpu/amd/car/post_cache_as_ram.c Mon Mar 22 17:33:25 2010 (r5268) @@ -97,7 +97,7 @@ /* clear only coreboot used region of memory. Note: this may break ECC enabled boards */ memset((void*) CONFIG_RAMBASE, 0, (CONFIG_RAMTOP) - CONFIG_RAMBASE - CONFIG_DCACHE_RAM_SIZE); #else
- memset((void*)0, 0, ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_SIZE));
- //memset((void*)CONFIG_RAMBASE, 0, ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_SIZE - 0xa0000));
#endif print_debug("Done\r\n");
Is this OK?
+++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Mon Mar 22 17:33:25 2010 (r5268) @@ -203,7 +203,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n");
- printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
This and another place or two seems to have strange whitespace?
+++ trunk/src/mainboard/technologic/ts5300/mainboard.c Mon Mar 22 17:33:25 2010 (r5268) @@ -7,7 +7,8 @@ #include "chip.h"
-static void irqdump() +#if 0 +static void irqdump(void)
Maybe remove the function, or move it to lib/ ?
//Peter
repository service wrote:
+++ trunk/src/cpu/amd/car/post_cache_as_ram.c Mon Mar 22 17:33:25
2010
(r5268)
@@ -97,7 +97,7 @@ /* clear only coreboot used region of memory. Note: this may break
ECC enabled boards */
memset((void*) CONFIG_RAMBASE, 0, (CONFIG_RAMTOP) - CONFIG_RAMBASE -
CONFIG_DCACHE_RAM_SIZE);
#else
- memset((void*)0, 0, ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_SIZE));
- //memset((void*)CONFIG_RAMBASE, 0, ((CONFIG_RAMTOP) -
CONFIG_DCACHE_RAM_SIZE - 0xa0000));
#endif print_debug("Done\r\n");
Is this OK?
No. I reverted it in the next commit. I was trying to see why fam10 boots so slowly, and this and another hunk slipped in.
+++ trunk/src/mainboard/supermicro/h8dmr/romstage.c Mon Mar 22 17:33:25
2010 (r5268)
@@ -203,7 +203,7 @@ /* Halt if there was a built in self test failure */ report_bist_failure(bist);
print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo);print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n");
- printk(BIOS_DEBUG, "*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
This and another place or two seems to have strange whitespace?
I'll look. There were a couple of places where indenting was broken in the original file.
+++ trunk/src/mainboard/technologic/ts5300/mainboard.c Mon Mar 22
17:33:25 2010 (r5268)
@@ -7,7 +7,8 @@ #include "chip.h"
-static void irqdump() +#if 0 +static void irqdump(void)
Maybe remove the function, or move it to lib/ ?
I didn't because the function call was commented out in the same file. It seemed like debugging documentation.
Thanks, Myles
-
Myles Watson -
Peter Stuge -
repository service