Index: svn/src/mainboard/asus/p2b-d/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/p2b-d/mptable.c
+++ svn/src/mainboard/asus/p2b-d/mptable.c
@@ -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";
Index: svn/src/mainboard/asus/p2b-ds/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/p2b-ds/mptable.c
+++ svn/src/mainboard/asus/p2b-ds/mptable.c
@@ -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";
Index: svn/src/southbridge/nvidia/ck804/ck804_nic.c
===================================================================
--- svn.orig/src/southbridge/nvidia/ck804/ck804_nic.c
+++ svn/src/southbridge/nvidia/ck804/ck804_nic.c
@@ -18,11 +18,11 @@ static void nic_init(struct device *dev)
 	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 @@ static void nic_init(struct device *dev)
 	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. */
Index: svn/src/mainboard/intel/mtarvon/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/mtarvon/mptable.c
+++ svn/src/mainboard/intel/mtarvon/mptable.c
@@ -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   ";
Index: svn/src/mainboard/rca/rm4100/mainboard_smi.c
===================================================================
--- svn.orig/src/mainboard/rca/rm4100/mainboard_smi.c
+++ svn/src/mainboard/rca/rm4100/mainboard_smi.c
@@ -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)
 {
Index: svn/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
===================================================================
--- svn.orig/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
+++ svn/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
@@ -56,7 +56,6 @@ static void pcie_init(struct device *dev
 
 static void pcie_bus_enable_resources(struct device *dev)
 {
-	u8 val8;
 	if (dev->link[0].bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
 		printk_spew("Enable VGA IO/MEM forwarding on PCIe port\n");
 		pci_write_config8(dev, PCI_BRIDGE_CONTROL, 8);
Index: svn/src/southbridge/intel/i3100/i3100_lpc.c
===================================================================
--- svn.orig/src/southbridge/intel/i3100/i3100_lpc.c
+++ svn/src/southbridge/intel/i3100/i3100_lpc.c
@@ -317,7 +317,7 @@ static void lpc_init(struct device *dev)
 	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)
Index: svn/src/southbridge/intel/i3100/i3100_reset.c
===================================================================
--- svn.orig/src/southbridge/intel/i3100/i3100_reset.c
+++ svn/src/southbridge/intel/i3100/i3100_reset.c
@@ -19,6 +19,7 @@
  */
 
 #include <arch/io.h>
+#include <reset.h>
 
 void hard_reset(void)
 {
Index: svn/src/mainboard/amd/dbm690t/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/mptable.c
+++ svn/src/mainboard/amd/dbm690t/mptable.c
@@ -38,7 +38,7 @@ extern u32 sbdn_sb600;
 
 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     ";
Index: svn/src/mainboard/amd/mahogany/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany/mptable.c
+++ svn/src/mainboard/amd/mahogany/mptable.c
@@ -39,7 +39,7 @@ extern u32 sbdn_sb700;
 
 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     ";
Index: svn/src/mainboard/amd/mahogany_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany_fam10/mptable.c
+++ svn/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -39,7 +39,7 @@ extern u32 sbdn_sb700;
 
 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     ";
Index: svn/src/mainboard/amd/pistachio/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/mptable.c
+++ svn/src/mainboard/amd/pistachio/mptable.c
@@ -38,7 +38,7 @@ extern u32 sbdn_sb600;
 
 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     ";
Index: svn/src/mainboard/amd/serengeti_cheetah/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah/mptable.c
+++ svn/src/mainboard/amd/serengeti_cheetah/mptable.c
@@ -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     ";
Index: svn/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ svn/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -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     ";
Index: svn/src/mainboard/asus/a8n_e/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/a8n_e/mptable.c
+++ svn/src/mainboard/asus/a8n_e/mptable.c
@@ -34,7 +34,7 @@ extern unsigned apicid_ck804;
 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    ";
Index: svn/src/mainboard/asus/a8v-e_se/mptable.c
===================================================================
--- svn.orig/src/mainboard/asus/a8v-e_se/mptable.c
+++ svn/src/mainboard/asus/a8v-e_se/mptable.c
@@ -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    ";
Index: svn/src/mainboard/broadcom/blast/mptable.c
===================================================================
--- svn.orig/src/mainboard/broadcom/blast/mptable.c
+++ svn/src/mainboard/broadcom/blast/mptable.c
@@ -21,7 +21,7 @@ extern  unsigned sbdn2;
 
 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";
Index: svn/src/mainboard/dell/s1850/reset.c
===================================================================
--- svn.orig/src/mainboard/dell/s1850/reset.c
+++ svn/src/mainboard/dell/s1850/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
@@ -35,7 +35,7 @@ extern unsigned apicid_sis966;
 
 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";
Index: svn/src/mainboard/gigabyte/m57sli/mptable.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/m57sli/mptable.c
+++ svn/src/mainboard/gigabyte/m57sli/mptable.c
@@ -36,7 +36,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] = "GIGABYTE";
Index: svn/src/mainboard/hp/dl145_g3/mptable.c
===================================================================
--- svn.orig/src/mainboard/hp/dl145_g3/mptable.c
+++ svn/src/mainboard/hp/dl145_g3/mptable.c
@@ -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 @@ void *smp_write_config_table(void *v)
 			if (dev) {
 				res = find_resource(dev, PCI_BASE_ADDRESS_0);
 				if (res) {
-					printk_debug("APIC %d base address: %x\n",m->apicid_bcm5785[i],  res->base);
+					printk_debug("APIC %d base address: %llx\n",m->apicid_bcm5785[i],  res->base);
 					smp_write_ioapic(mc, m->apicid_bcm5785[i], 0x11, res->base);
 				}
 			}
Index: svn/src/mainboard/ibm/e325/mptable.c
===================================================================
--- svn.orig/src/mainboard/ibm/e325/mptable.c
+++ svn/src/mainboard/ibm/e325/mptable.c
@@ -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     ";
Index: svn/src/mainboard/ibm/e326/mptable.c
===================================================================
--- svn.orig/src/mainboard/ibm/e326/mptable.c
+++ svn/src/mainboard/ibm/e326/mptable.c
@@ -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     ";
Index: svn/src/mainboard/intel/d945gclf/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/d945gclf/mptable.c
+++ svn/src/mainboard/intel/d945gclf/mptable.c
@@ -25,7 +25,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";
Index: svn/src/mainboard/intel/eagleheights/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/eagleheights/mptable.c
+++ svn/src/mainboard/intel/eagleheights/mptable.c
@@ -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   ";
Index: svn/src/mainboard/intel/jarrell/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/jarrell/mptable.c
+++ svn/src/mainboard/intel/jarrell/mptable.c
@@ -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    ";
Index: svn/src/mainboard/intel/truxton/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/truxton/mptable.c
+++ svn/src/mainboard/intel/truxton/mptable.c
@@ -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   ";
Index: svn/src/mainboard/intel/xe7501devkit/mptable.c
===================================================================
--- svn.orig/src/mainboard/intel/xe7501devkit/mptable.c
+++ svn/src/mainboard/intel/xe7501devkit/mptable.c
@@ -142,7 +142,7 @@ void xe7501devkit_register_interrupts(st
 	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   ";
Index: svn/src/mainboard/iwill/dk8s2/mptable.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8s2/mptable.c
+++ svn/src/mainboard/iwill/dk8s2/mptable.c
@@ -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   ";
Index: svn/src/mainboard/iwill/dk8x/mptable.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8x/mptable.c
+++ svn/src/mainboard/iwill/dk8x/mptable.c
@@ -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   ";
Index: svn/src/mainboard/kontron/kt690/mptable.c
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/mptable.c
+++ svn/src/mainboard/kontron/kt690/mptable.c
@@ -38,7 +38,7 @@ extern u32 sbdn_sb600;
 
 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 ";
Index: svn/src/mainboard/msi/ms7135/mptable.c
===================================================================
--- svn.orig/src/mainboard/msi/ms7135/mptable.c
+++ svn/src/mainboard/msi/ms7135/mptable.c
@@ -38,7 +38,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] = "MSI     ";
Index: svn/src/mainboard/msi/ms7260/mptable.c
===================================================================
--- svn.orig/src/mainboard/msi/ms7260/mptable.c
+++ svn/src/mainboard/msi/ms7260/mptable.c
@@ -33,7 +33,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] = "MSI     ";
Index: svn/src/mainboard/msi/ms9185/mptable.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/mptable.c
+++ svn/src/mainboard/msi/ms9185/mptable.c
@@ -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";
Index: svn/src/mainboard/msi/ms9282/mptable.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9282/mptable.c
+++ svn/src/mainboard/msi/ms9282/mptable.c
@@ -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    ";
Index: svn/src/mainboard/msi/ms9652_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9652_fam10/mptable.c
+++ svn/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -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     ";
Index: svn/src/mainboard/newisys/khepri/mptable.c
===================================================================
--- svn.orig/src/mainboard/newisys/khepri/mptable.c
+++ svn/src/mainboard/newisys/khepri/mptable.c
@@ -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 ";
Index: svn/src/mainboard/nvidia/l1_2pvv/mptable.c
===================================================================
--- svn.orig/src/mainboard/nvidia/l1_2pvv/mptable.c
+++ svn/src/mainboard/nvidia/l1_2pvv/mptable.c
@@ -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  ";
Index: svn/src/mainboard/roda/rk886ex/mptable.c
===================================================================
--- svn.orig/src/mainboard/roda/rk886ex/mptable.c
+++ svn/src/mainboard/roda/rk886ex/mptable.c
@@ -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] = "PCMP";
         static const char oem[8] = "COREBOOT";
Index: svn/src/mainboard/sunw/ultra40/mptable.c
===================================================================
--- svn.orig/src/mainboard/sunw/ultra40/mptable.c
+++ svn/src/mainboard/sunw/ultra40/mptable.c
@@ -34,7 +34,7 @@ extern  unsigned sbdnb;
 
 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    ";
Index: svn/src/mainboard/supermicro/h8dme/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/mptable.c
+++ svn/src/mainboard/supermicro/h8dme/mptable.c
@@ -35,7 +35,7 @@ extern unsigned char bus_pcix[3]; // und
 
 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";
Index: svn/src/mainboard/supermicro/h8dmr/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/mptable.c
+++ svn/src/mainboard/supermicro/h8dmr/mptable.c
@@ -35,7 +35,7 @@ extern unsigned char bus_pcix[3]; // und
 
 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";
Index: svn/src/mainboard/supermicro/h8dmr_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ svn/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -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";
Index: svn/src/mainboard/supermicro/h8qme_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ svn/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -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";
Index: svn/src/mainboard/supermicro/x6dai_g/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dai_g/mptable.c
+++ svn/src/mainboard/supermicro/x6dai_g/mptable.c
@@ -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    ";
Index: svn/src/mainboard/supermicro/x6dhe_g/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhe_g/mptable.c
+++ svn/src/mainboard/supermicro/x6dhe_g/mptable.c
@@ -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    ";
Index: svn/src/mainboard/supermicro/x6dhe_g2/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhe_g2/mptable.c
+++ svn/src/mainboard/supermicro/x6dhe_g2/mptable.c
@@ -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    ";
Index: svn/src/mainboard/supermicro/x6dhr_ig/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhr_ig/mptable.c
+++ svn/src/mainboard/supermicro/x6dhr_ig/mptable.c
@@ -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    ";
Index: svn/src/mainboard/supermicro/x6dhr_ig2/mptable.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhr_ig2/mptable.c
+++ svn/src/mainboard/supermicro/x6dhr_ig2/mptable.c
@@ -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    ";
Index: svn/src/mainboard/technexion/tim5690/mptable.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/mptable.c
+++ svn/src/mainboard/technexion/tim5690/mptable.c
@@ -38,7 +38,7 @@ extern u32 sbdn_sb600;
 
 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     ";
Index: svn/src/mainboard/technexion/tim8690/mptable.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/mptable.c
+++ svn/src/mainboard/technexion/tim8690/mptable.c
@@ -38,7 +38,7 @@ extern u32 sbdn_sb600;
 
 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     ";
Index: svn/src/mainboard/tyan/s2735/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2735/mptable.c
+++ svn/src/mainboard/tyan/s2735/mptable.c
@@ -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    ";
Index: svn/src/mainboard/tyan/s2850/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2850/mptable.c
+++ svn/src/mainboard/tyan/s2850/mptable.c
@@ -43,7 +43,7 @@ static unsigned node_link_to_bus(unsigne
 }
 
 
-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    ";
Index: svn/src/mainboard/tyan/s2875/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2875/mptable.c
+++ svn/src/mainboard/tyan/s2875/mptable.c
@@ -41,7 +41,7 @@ static unsigned node_link_to_bus(unsigne
         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    ";
Index: svn/src/mainboard/tyan/s2880/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2880/mptable.c
+++ svn/src/mainboard/tyan/s2880/mptable.c
@@ -43,7 +43,7 @@ static unsigned node_link_to_bus(unsigne
 }
 
 
-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    ";
Index: svn/src/mainboard/tyan/s2881/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2881/mptable.c
+++ svn/src/mainboard/tyan/s2881/mptable.c
@@ -20,7 +20,7 @@ extern  unsigned sbdn3;
 
 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    ";
Index: svn/src/mainboard/tyan/s2882/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2882/mptable.c
+++ svn/src/mainboard/tyan/s2882/mptable.c
@@ -43,7 +43,7 @@ static unsigned node_link_to_bus(unsigne
         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    ";
Index: svn/src/mainboard/tyan/s2885/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2885/mptable.c
+++ svn/src/mainboard/tyan/s2885/mptable.c
@@ -24,7 +24,7 @@ extern  unsigned sbdn5;
 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    ";
Index: svn/src/mainboard/tyan/s2891/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/mptable.c
+++ svn/src/mainboard/tyan/s2891/mptable.c
@@ -24,7 +24,7 @@ extern  unsigned sbdn3;
 
 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    ";
Index: svn/src/mainboard/tyan/s2912/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912/mptable.c
+++ svn/src/mainboard/tyan/s2912/mptable.c
@@ -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    ";
Index: svn/src/mainboard/tyan/s2912_fam10/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/mptable.c
+++ svn/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -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    ";
Index: svn/src/mainboard/tyan/s4880/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s4880/mptable.c
+++ svn/src/mainboard/tyan/s4880/mptable.c
@@ -41,7 +41,7 @@ static unsigned node_link_to_bus(unsigne
         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    ";
Index: svn/src/mainboard/tyan/s4882/mptable.c
===================================================================
--- svn.orig/src/mainboard/tyan/s4882/mptable.c
+++ svn/src/mainboard/tyan/s4882/mptable.c
@@ -42,7 +42,7 @@ static unsigned node_link_to_bus(unsigne
         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    ";
Index: svn/src/mainboard/via/epia-n/mptable.c
===================================================================
--- svn.orig/src/mainboard/via/epia-n/mptable.c
+++ svn/src/mainboard/via/epia-n/mptable.c
@@ -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    ";
Index: svn/src/mainboard/via/pc2500e/mptable.c
===================================================================
--- svn.orig/src/mainboard/via/pc2500e/mptable.c
+++ svn/src/mainboard/via/pc2500e/mptable.c
@@ -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     ";
Index: svn/src/mainboard/via/vt8454c/mptable.c
===================================================================
--- svn.orig/src/mainboard/via/vt8454c/mptable.c
+++ svn/src/mainboard/via/vt8454c/mptable.c
@@ -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";
Index: svn/src/southbridge/intel/i82801ex/i82801ex_reset.c
===================================================================
--- svn.orig/src/southbridge/intel/i82801ex/i82801ex_reset.c
+++ svn/src/southbridge/intel/i82801ex/i82801ex_reset.c
@@ -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);
Index: svn/src/cpu/amd/model_gx2/cpubug.c
===================================================================
--- svn.orig/src/cpu/amd/model_gx2/cpubug.c
+++ svn/src/cpu/amd/model_gx2/cpubug.c
@@ -356,7 +356,7 @@ cpubug(void)
 
 	rev = msr.lo & 0xff;
 	if (rev < 0x20) {
-		printk_err("%s: rev < 0x20! bailing!\n");
+		printk_err("%s: rev < 0x20! bailing!\n", __func__);
 		return;
 	}
 	printk_debug("Doing cpubug fixes for rev 0x%x\n", rev);
Index: svn/src/cpu/amd/sc520/sc520.c
===================================================================
--- svn.orig/src/cpu/amd/sc520/sc520.c
+++ svn/src/cpu/amd/sc520/sc520.c
@@ -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 @@ void sc520_udelay(int microseconds) {
 
 /* looks like we define this now */
 void
-udelay(int microseconds) {
+udelay(unsigned microseconds) {
         sc520_udelay(microseconds); 
 }
 /*
@@ -46,7 +47,7 @@ static void cpu_init(device_t dev) 
  * 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_spew("%s\n", __func__);
@@ -100,7 +101,7 @@ static void ram_resource(device_t dev, u
         unsigned long basek, unsigned long sizek)
 {
         struct resource *resource;
-  printk_spew("%s sizek 0x%x\n", __func__, sizek);
+	printk_spew("%s sizek 0x%lx\n", __func__, sizek);
         if (!sizek) {
                 return;
         }
Index: svn/src/mainboard/amd/mahogany/mainboard.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany/mainboard.c
+++ svn/src/mainboard/amd/mahogany/mainboard.c
@@ -153,10 +153,10 @@ int add_mainboard_resources(struct lb_me
 	 * in some circumstances we want the memory mentioned as reserved.
  	 */
 #if (CONFIG_GFXUMA == 1)
-	printk_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_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
 }
 
Index: svn/src/mainboard/amd/mahogany_fam10/mainboard.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ svn/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -153,10 +153,10 @@ int add_mainboard_resources(struct lb_me
 	 * in some circumstances we want the memory mentioned as reserved.
  	 */
 #if (CONFIG_GFXUMA == 1)
-	printk_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_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
 }
 
Index: svn/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
+++ svn/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
@@ -70,7 +70,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (u8 *)(addr);
Index: svn/src/mainboard/asus/a8n_e/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/asus/a8n_e/irq_tables.c
+++ svn/src/mainboard/asus/a8n_e/irq_tables.c
@@ -78,7 +78,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000. */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/broadcom/blast/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/broadcom/blast/irq_tables.c
+++ svn/src/mainboard/broadcom/blast/irq_tables.c
@@ -60,7 +60,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/digitallogic/msm586seg/mainboard.c
===================================================================
--- svn.orig/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ svn/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -26,7 +26,7 @@ static void irqdump()
   printk_err("mmcr is %p\n", mmcr);
   for(i = 0; irqlist[i] >= 0; i++) {
     irq = mmcr + irqlist[i];
-    printk_err("0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq);
+    printk_err("0x%x register @%p is 0x%x\n", irqlist[i], irq, *irq);
   }
 
 }
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
@@ -77,7 +77,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/gigabyte/m57sli/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/m57sli/irq_tables.c
+++ svn/src/mainboard/gigabyte/m57sli/irq_tables.c
@@ -75,7 +75,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/intel/eagleheights/reset.c
===================================================================
--- svn.orig/src/mainboard/intel/eagleheights/reset.c
+++ svn/src/mainboard/intel/eagleheights/reset.c
@@ -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 @@ void hard_reset(void)
 {
 	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);
-}
-
Index: svn/src/mainboard/intel/jarrell/reset.c
===================================================================
--- svn.orig/src/mainboard/intel/jarrell/reset.c
+++ svn/src/mainboard/intel/jarrell/reset.c
@@ -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__)
Index: svn/src/mainboard/msi/ms7135/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms7135/irq_tables.c
+++ svn/src/mainboard/msi/ms7135/irq_tables.c
@@ -91,7 +91,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *) (addr);
Index: svn/src/mainboard/msi/ms7260/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms7260/irq_tables.c
+++ svn/src/mainboard/msi/ms7260/irq_tables.c
@@ -71,7 +71,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 and 0x100000. */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/msi/ms9185/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/irq_tables.c
+++ svn/src/mainboard/msi/ms9185/irq_tables.c
@@ -82,7 +82,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
        pirq = (void *)(addr);
        v = (uint8_t *)(addr);
Index: svn/src/mainboard/msi/ms9282/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9282/irq_tables.c
+++ svn/src/mainboard/msi/ms9282/irq_tables.c
@@ -79,7 +79,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
        pirq = (void *)(addr);
        v = (uint8_t *)(addr);
Index: svn/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ svn/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -131,10 +131,10 @@ void get_bus_conf(void)
 /*I/O APICs:	APIC ID	Version	State		Address*/
 #if CONFIG_LOGICAL_CPUS==1
 	apicid_base = get_apicid_base(1);
-	printk_spew("CONFIG_LOGICAL_CPUS==1: apicid_base: %08x\n");
+	printk_spew("CONFIG_LOGICAL_CPUS==1: apicid_base: %08x\n", apicid_base);
 #else
 	apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
-	printk_spew("CONFIG_LOGICAL_CPUS==0: apicid_base: %08x\n");
+	printk_spew("CONFIG_LOGICAL_CPUS==0: apicid_base: %08x\n", apicid_base);
 #endif
 	m->apicid_mcp55 = apicid_base+0;
 }
Index: svn/src/mainboard/msi/ms9652_fam10/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9652_fam10/irq_tables.c
+++ svn/src/mainboard/msi/ms9652_fam10/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/nvidia/l1_2pvv/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/nvidia/l1_2pvv/irq_tables.c
+++ svn/src/mainboard/nvidia/l1_2pvv/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/olpc/btest/mainboard.c
===================================================================
--- svn.orig/src/mainboard/olpc/btest/mainboard.c
+++ svn/src/mainboard/olpc/btest/mainboard.c
@@ -61,7 +61,7 @@ static void init_dcon(void) {
 	/* Enable the DCON */
 	ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069);
 	if (ret != 0)
-		printk_debug("DCON ENABLE FAILED\n", ret);
+		printk_debug("DCON ENABLE FAILED %d\n", ret);
   }
   else
 	  printk_debug("DCON NOT FOUND (%x)\n", rev);
Index: svn/src/mainboard/olpc/rev_a/mainboard.c
===================================================================
--- svn.orig/src/mainboard/olpc/rev_a/mainboard.c
+++ svn/src/mainboard/olpc/rev_a/mainboard.c
@@ -60,7 +60,7 @@ static void init_dcon(void) {
 	/* Enable the DCON */
 	ret = do_smbus_write_word(iobase, 0x0D << 1, 0x01, 0x0069);
 	if (ret != 0)
-		printk_debug("DCON ENABLE FAILED\n", ret);
+		printk_debug("DCON ENABLE FAILED %d\n", ret);
   }
   else
 	  printk_debug("DCON NOT FOUND (%x)\n", rev);
Index: svn/src/mainboard/sunw/ultra40/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/sunw/ultra40/irq_tables.c
+++ svn/src/mainboard/sunw/ultra40/irq_tables.c
@@ -71,7 +71,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/supermicro/h8dme/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/irq_tables.c
+++ svn/src/mainboard/supermicro/h8dme/irq_tables.c
@@ -75,7 +75,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/supermicro/h8dmr/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/irq_tables.c
+++ svn/src/mainboard/supermicro/h8dmr/irq_tables.c
@@ -75,7 +75,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
+++ svn/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be between 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
+++ svn/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be between 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/supermicro/x6dai_g/reset.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dai_g/reset.c
+++ svn/src/mainboard/supermicro/x6dai_g/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/supermicro/x6dhe_g/reset.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhe_g/reset.c
+++ svn/src/mainboard/supermicro/x6dhe_g/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/supermicro/x6dhe_g2/reset.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhe_g2/reset.c
+++ svn/src/mainboard/supermicro/x6dhe_g2/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/supermicro/x6dhr_ig/reset.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhr_ig/reset.c
+++ svn/src/mainboard/supermicro/x6dhr_ig/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/supermicro/x6dhr_ig2/reset.c
===================================================================
--- svn.orig/src/mainboard/supermicro/x6dhr_ig2/reset.c
+++ svn/src/mainboard/supermicro/x6dhr_ig2/reset.c
@@ -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 @@ void hard_reset(void)
         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);
-}
-
-
Index: svn/src/mainboard/technologic/ts5300/mainboard.c
===================================================================
--- svn.orig/src/mainboard/technologic/ts5300/mainboard.c
+++ svn/src/mainboard/technologic/ts5300/mainboard.c
@@ -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 @@ static void irqdump()
   printk_err("mmcr is %p\n", mmcr);
   for(i = 0; irqlist[i] >= 0; i++) {
     irq = mmcr + irqlist[i];
-    printk_err("0x%x register @%p is 0x%lx\n", irqlist[i], irq, *irq);
+    printk_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. */
Index: svn/src/mainboard/tyan/s2881/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2881/irq_tables.c
+++ svn/src/mainboard/tyan/s2881/irq_tables.c
@@ -58,7 +58,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/tyan/s2882/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2882/irq_tables.c
+++ svn/src/mainboard/tyan/s2882/irq_tables.c
@@ -158,7 +158,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...\n", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...\n", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/tyan/s2885/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2885/irq_tables.c
+++ svn/src/mainboard/tyan/s2885/irq_tables.c
@@ -61,7 +61,7 @@ unsigned long write_pirq_routing_table(u
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...", addr);
+        printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/tyan/s2891/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2891/irq_tables.c
+++ svn/src/mainboard/tyan/s2891/irq_tables.c
@@ -67,7 +67,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/tyan/s2912/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912/irq_tables.c
+++ svn/src/mainboard/tyan/s2912/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/tyan/s2912_fam10/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/irq_tables.c
+++ svn/src/mainboard/tyan/s2912_fam10/irq_tables.c
@@ -76,7 +76,7 @@ unsigned long write_pirq_routing_table(u
 	addr &= ~15;
 
 	/* This table must be betweeen 0xf0000 & 0x100000 */
-	printk_info("Writing IRQ routing tables to 0x%x...", addr);
+	printk_info("Writing IRQ routing tables to 0x%lx...", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
Index: svn/src/mainboard/via/epia-m/vgabios.c
===================================================================
--- svn.orig/src/mainboard/via/epia-m/vgabios.c
+++ svn/src/mainboard/via/epia-m/vgabios.c
@@ -371,7 +371,7 @@ void do_vgabios(void)
 		buf = (unsigned char *) 0xc0000;
 		if (buf[0]==0x55 && buf[1]==0xAA) {
 			busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn;
-			printk_debug("bus/devfn = %#x\n", busdevfn);
+			printk_debug("bus/devfn = %#lx\n", busdevfn);
 
 		    	real_mode_switch_call_vga(busdevfn);
 		} else
@@ -567,14 +567,14 @@ int biosint(unsigned long intnumber,
 		      eax, ebx, ecx, edx);
 	printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
 		     ebp, esp, edi, esi);
-	printk_debug("biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+	printk_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_info("biosint: Oops, exception %u\n", intnumber);
+		printk_info("biosint: Oops, exception %lu\n", intnumber);
 		if (esp < 0x1000) {
 			printk_debug("Stack contents: ");
 			while (esp < 0x1000) {
@@ -602,8 +602,7 @@ int biosint(unsigned long intnumber,
 				&ebx, &edx, &ecx, &eax, &flags);
 		break;
 	default:
-		printk_info("BIOSINT: Unsupport int #0x%x\n", 
-			    intnumber);
+		printk_info("BIOSINT: Unsupport int #0x%lx\n", intnumber);
 		break;
 	}
 	if (ret)
Index: svn/src/northbridge/amd/amdfam10/amdfam10_acpi.c
===================================================================
--- svn.orig/src/northbridge/amd/amdfam10/amdfam10_acpi.c
+++ svn/src/northbridge/amd/amdfam10/amdfam10_acpi.c
@@ -89,7 +89,7 @@ static void set_srat_mem(void *gp, struc
 	basek = resk(res->base);
 	sizek = resk(res->size);
 
-	printk_debug("set_srat_mem: dev %s, res->index=%04x startk=%08x, sizek=%08x\n",
+	printk_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
Index: svn/src/northbridge/amd/amdfam10/northbridge.c
===================================================================
--- svn.orig/src/northbridge/amd/amdfam10/northbridge.c
+++ svn/src/northbridge/amd/amdfam10/northbridge.c
@@ -1086,7 +1086,7 @@ static void pci_domain_set_resources(dev
 		ram_resource(dev, (idx | i), basek, sizek);
 		idx += 0x10;
 #if CONFIG_WRITE_HIGH_TABLES==1
-		printk_debug("%d: mmio_basek=%08lx, basek=%08x, limitk=%08x\n",
+		printk_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 */
Index: svn/src/northbridge/amd/amdk8/northbridge.c
===================================================================
--- svn.orig/src/northbridge/amd/amdk8/northbridge.c
+++ svn/src/northbridge/amd/amdk8/northbridge.c
@@ -1005,7 +1005,7 @@ static void amdk8_domain_set_resources(d
 
 
 #if CONFIG_GFXUMA == 1
-		printk_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_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_alert("node %d: UMA memory starts below mmio_basek\n", i);
 #else
Index: svn/src/northbridge/amd/gx2/northbridge.c
===================================================================
--- svn.orig/src/northbridge/amd/gx2/northbridge.c
+++ svn/src/northbridge/amd/gx2/northbridge.c
@@ -127,7 +127,7 @@ static void irq_init_steering(struct dev
 	/* Set up IRQ steering */
 	uint32_t pciAddr = 0x80000000 | (CHIPSET_DEV_NUM << 11) | 0x5C;
 
-	printk_debug("%s(%08X [%08X], %04X)\n", __func__, dev, pciAddr, irq_map);
+	printk_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 @@ setup_gx2(void)
 	/* 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_debug("MSR 0x%x is now 0x%x:0x%x\n", 0x10000026, tmp, tmp2);
+	printk_debug("MSR 0x%x is now 0x%lx:0x%lx\n", 0x10000026, tmp, tmp2);
 	msr.hi = tmp;
 	msr.lo = tmp2;
 	wrmsr(0x10000026, msr);
Index: svn/src/northbridge/amd/gx2/northbridgeinit.c
===================================================================
--- svn.orig/src/northbridge/amd/gx2/northbridgeinit.c
+++ svn/src/northbridge/amd/gx2/northbridgeinit.c
@@ -112,10 +112,10 @@ writeglmsr(struct gliutable *gl){
 	msr.lo = gl->lo;
 	msr.hi = gl->hi;
 	wrmsr(gl->desc_name, msr);	// MSR - see table above
-	printk_debug("%s: write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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 @@ SysmemInit(struct gliutable *gl)
 	msr.lo = sizebytes;
 	wrmsr(gl->desc_name, msr);	// MSR - see table above
 	msr = rdmsr(gl->desc_name);
-	printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, 
+	printk_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 @@ DMMGL0Init(struct gliutable *gl) {
 
 	sizebytes -= DMM_SIZE*1024;
 	offset = sizebytes - DMM_OFFSET;
-	printk_debug("%s: offset is 0x%08x\n", __func__, offset);
+	printk_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 @@ DMMGL0Init(struct gliutable *gl) {
 	
 	wrmsr(gl->desc_name, msr);	// MSR - See table above
 	msr = rdmsr(gl->desc_name);
-	printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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 @@ DMMGL1Init(struct gliutable *gl) {
 	
 	wrmsr(gl->desc_name, msr);	// MSR - See table above
 	msr = rdmsr(gl->desc_name);
-	printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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 @@ SMMGL0Init(struct gliutable *gl) {
 	printk_debug("%s: %d bytes\n", __func__, sizebytes);
 
 	offset = sizebytes - SMM_OFFSET;
-	printk_debug("%s: offset is 0x%08x\n", __func__, offset);
+	printk_debug("%s: offset is 0x%08lx\n", __func__, offset);
 	offset >>= 12;
 
 	msr.hi = offset << 8;
@@ -242,7 +242,7 @@ SMMGL0Init(struct gliutable *gl) {
 	
 	wrmsr(gl->desc_name, msr);	// MSR - See table above
 	msr = rdmsr(gl->desc_name);
-	printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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 @@ SMMGL1Init(struct gliutable *gl) {
 	
 	wrmsr(gl->desc_name, msr);	// MSR - See table above
 	msr = rdmsr(gl->desc_name);
-	printk_debug("%s: AFTER write msr 0x%08x, val 0x%08x:0x%08x\n", __func__, gl->desc_name, msr.hi, msr.lo);
+	printk_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 @@ performance:
 
 	for(i = 0; gating->msrnum != 0xffffffff; i++) {
 		msr = rdmsr(gating->msrnum);
-		printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, gating->msrnum, msr.hi, msr.lo);
+		printk_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_debug("%s: MSR 0x%08x will be set to  0x%08x:0x%08x\n", __func__, 
+		printk_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 @@ GeodeLinkPriority(void){
 
 	for(i = 0; prio->msrnum != 0xffffffff; i++) {
 		msr = rdmsr(prio->msrnum);
-		printk_debug("%s: MSR 0x%08x is 0x%08x:0x%08x\n", __func__, prio->msrnum, msr.hi, msr.lo);
+		printk_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_debug("%s: MSR 0x%08x will be set to 0x%08x:0x%08x\n", __func__, 
+		printk_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;
Index: svn/src/northbridge/amd/lx/northbridge.c
===================================================================
--- svn.orig/src/northbridge/amd/lx/northbridge.c
+++ svn/src/northbridge/amd/lx/northbridge.c
@@ -342,7 +342,7 @@ void northbridge_set_resources(struct de
 		if (bus->children) {
 			printk_debug
 			    ("my_dev_set_resources: assign_resources %d\n",
-			     bus);
+			     bus->secondary);
 			assign_resources(bus);
 		}
 	}
Index: svn/src/northbridge/intel/i82810/northbridge.c
===================================================================
--- svn.orig/src/northbridge/intel/i82810/northbridge.c
+++ svn/src/northbridge/intel/i82810/northbridge.c
@@ -142,7 +142,7 @@ static void pci_domain_set_resources(dev
 		drp_value = drp_value >> 4;	// >>= 4; //? mess with later
 		tomk += (unsigned long)(translate_i82810_to_mb[drp_value]);
 
-		printk_debug("Setting RAM size to %d MB\n", tomk);
+		printk_debug("Setting RAM size to %ld MB\n", tomk);
 
 		/* Convert tomk from MB to KB. */
 		tomk = tomk << 10;
Index: svn/src/northbridge/intel/i855/northbridge.c
===================================================================
--- svn.orig/src/northbridge/intel/i855/northbridge.c
+++ svn/src/northbridge/intel/i855/northbridge.c
@@ -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 @@ static void pci_domain_set_resources(dev
 		 * 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 @@ static void pci_domain_set_resources(dev
 		 */
 		 
 		/* Report the memory regions */
-		printk_debug("tomk = %d\n", tomk);
-		printk_debug("tolmk = %d\n", tolmk);
+		printk_debug("tomk = %ld\n", tomk);
+		printk_debug("tolmk = %ld\n", tolmk);
 
 		idx = 10;
 		/* avoid pam region */
@@ -165,8 +164,6 @@ static struct device_operations cpu_bus_
 
 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;
Index: svn/src/northbridge/via/cn400/northbridge.c
===================================================================
--- svn.orig/src/northbridge/via/cn400/northbridge.c
+++ svn/src/northbridge/via/cn400/northbridge.c
@@ -244,7 +244,7 @@ static void cn400_domain_set_resources(d
 		tomk = rambits * 32 * 1024;
 		/* Compute the Top Of Low Memory (TOLM), in Kb. */
 		tolmk = pci_tolm >> 10;
-		printk_spew("tomk is 0x%x, tolmk is 0x%08X\n", tomk, tolmk);
+		printk_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;
Index: svn/src/northbridge/via/cn400/vgabios.c
===================================================================
--- svn.orig/src/northbridge/via/cn400/vgabios.c
+++ svn/src/northbridge/via/cn400/vgabios.c
@@ -371,7 +371,7 @@ void do_vgabios(void)
 		buf = (unsigned char *) 0xc0000;
 		if (buf[0]==0x55 && buf[1]==0xAA) {
 			busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn;
-			printk_debug("bus/devfn = %#x\n", busdevfn);
+			printk_debug("bus/devfn = %#lx\n", busdevfn);
 
 		    	real_mode_switch_call_vga(busdevfn);
 		} else
@@ -567,14 +567,14 @@ int biosint(unsigned long intnumber,
 		      eax, ebx, ecx, edx);
 	printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
 		     ebp, esp, edi, esi);
-	printk_debug("biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+	printk_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_info("biosint: Oops, exception %u\n", intnumber);
+		printk_info("biosint: Oops, exception %lu\n", intnumber);
 		if (esp < 0x1000) {
 			printk_debug("Stack contents: ");
 			while (esp < 0x1000) {
@@ -602,8 +602,7 @@ int biosint(unsigned long intnumber,
 				&ebx, &edx, &ecx, &eax, &flags);
 		break;
 	default:
-		printk_info("BIOSINT: Unsupport int #0x%x\n", 
-			    intnumber);
+		printk_info("BIOSINT: Unsupport int #0x%lx\n", intnumber);
 		break;
 	}
 	if (ret)
Index: svn/src/northbridge/via/cn700/northbridge.c
===================================================================
--- svn.orig/src/northbridge/via/cn700/northbridge.c
+++ svn/src/northbridge/via/cn700/northbridge.c
@@ -177,7 +177,7 @@ static void pci_domain_set_resources(dev
 		}
 
 		tomk = rambits * 64 * 1024;
-		printk_spew("tomk is 0x%x\n", tomk);
+		printk_spew("tomk is 0x%lx\n", tomk);
 		/* Compute the Top Of Low Memory (TOLM), in Kb. */
 		tolmk = pci_tolm >> 10;
 		if (tolmk >= tomk) {
Index: svn/src/northbridge/via/cn700/vgabios.c
===================================================================
--- svn.orig/src/northbridge/via/cn700/vgabios.c
+++ svn/src/northbridge/via/cn700/vgabios.c
@@ -371,7 +371,7 @@ void do_vgabios(void)
 		buf = (unsigned char *) 0xc0000;
 		if (buf[0]==0x55 && buf[1]==0xAA) {
 			busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn;
-			printk_debug("bus/devfn = %#x\n", busdevfn);
+			printk_debug("bus/devfn = %#lx\n", busdevfn);
 
 		    	real_mode_switch_call_vga(busdevfn);
 		} else
@@ -567,14 +567,14 @@ int biosint(unsigned long intnumber,
 		      eax, ebx, ecx, edx);
 	printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
 		     ebp, esp, edi, esi);
-	printk_debug("biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+	printk_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_info("biosint: Oops, exception %u\n", intnumber);
+		printk_info("biosint: Oops, exception %lu\n", intnumber);
 		if (esp < 0x1000) {
 			printk_debug("Stack contents: ");
 			while (esp < 0x1000) {
@@ -602,8 +602,7 @@ int biosint(unsigned long intnumber,
 				&ebx, &edx, &ecx, &eax, &flags);
 		break;
 	default:
-		printk_info("BIOSINT: Unsupport int #0x%x\n", 
-			    intnumber);
+		printk_info("BIOSINT: Unsupport int #0x%lx\n", intnumber);
 		break;
 	}
 	if (ret)
Index: svn/src/northbridge/via/cx700/vgabios.c
===================================================================
--- svn.orig/src/northbridge/via/cx700/vgabios.c
+++ svn/src/northbridge/via/cx700/vgabios.c
@@ -339,7 +339,7 @@ void do_vgabios(void)
 		if (buf[0] == 0x55 && buf[1] == 0xAA) {
 			busdevfn =
 			    (dev->bus->secondary << 8) | dev->path.pci.devfn;
-			printk_debug("bus/devfn = %#x\n", busdevfn);
+			printk_debug("bus/devfn = %#lx\n", busdevfn);
 
 			real_mode_switch_call_vga(busdevfn);
 		} else
@@ -517,14 +517,14 @@ int biosint(unsigned long intnumber,
 		     eax, ebx, ecx, edx);
 	printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
 		     ebp, esp, edi, esi);
-	printk_debug("biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+	printk_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_info("biosint: Oops, exception %u\n", intnumber);
+		printk_info("biosint: Oops, exception %lu\n", intnumber);
 		if (esp < 0x1000) {
 			printk_debug("Stack contents: ");
 			while (esp < 0x1000) {
@@ -552,7 +552,7 @@ int biosint(unsigned long intnumber,
 				  &ebx, &edx, &ecx, &eax, &flags);
 		break;
 	default:
-		printk_info("BIOSINT: Unsupport int #0x%x\n", intnumber);
+		printk_info("BIOSINT: Unsupport int #0x%lx\n", intnumber);
 		break;
 	}
 	if (ret)
Index: svn/src/northbridge/via/vt8623/northbridge.c
===================================================================
--- svn.orig/src/northbridge/via/vt8623/northbridge.c
+++ svn/src/northbridge/via/vt8623/northbridge.c
@@ -48,7 +48,7 @@ static void northbridge_init(device_t de
 		 */
 		//fb = pci_read_config32(dev, 0x10);       /* Base addres of framebuffer */
 		fb = 0xd0000000;
-		printk_debug("Frame buffer at %8x\n",fb);
+		printk_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 */
Index: svn/src/northbridge/via/vx800/northbridge.c
===================================================================
--- svn.orig/src/northbridge/via/vx800/northbridge.c
+++ svn/src/northbridge/via/vx800/northbridge.c
@@ -162,7 +162,7 @@ if register with invalid value we set fr
 			    (((rambits << 6) - (4 << reg) -
 			      VIACONFIG_TOP_SM_SIZE_MB) * 1024);
 
-		printk_spew("tomk is 0x%x\n", tomk);
+		printk_spew("tomk is 0x%lx\n", tomk);
 		/* Compute the Top Of Low Memory, in Kb */
 		tolmk = pci_tolm >> 10;
 		if (tolmk >= tomk) {
Index: svn/src/northbridge/via/vx800/vgabios.c
===================================================================
--- svn.orig/src/northbridge/via/vx800/vgabios.c
+++ svn/src/northbridge/via/vx800/vgabios.c
@@ -338,7 +338,7 @@ void do_vgabios(void)
 		if (buf[0] == 0x55 && buf[1] == 0xAA) {
 			busdevfn =
 			    (dev->bus->secondary << 8) | dev->path.pci.devfn;
-			printk_debug("bus/devfn = %#x\n", busdevfn);
+			printk_debug("bus/devfn = %#lx\n", busdevfn);
 			real_mode_switch_call_vga(busdevfn);
 		} else
 			printk_debug("Failed to copy VGA BIOS to 0xc0000\n");
@@ -518,7 +518,7 @@ int biosint(unsigned long intnumber,
 		     eax, ebx, ecx, edx);
 	printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n",
 		     ebp, esp, edi, esi);
-	printk_debug("biosint:  ip 0x%x   cs 0x%x  flags 0x%x\n",
+	printk_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 @@ int biosint(unsigned long intnumber,
 	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_info("biosint: Oops, exception %u\n", intnumber);
+		printk_info("biosint: Oops, exception %lu\n", intnumber);
 		if (esp < 0x1000) {
 			printk_debug("Stack contents: ");
 			while (esp < 0x1000) {
@@ -556,7 +556,7 @@ int biosint(unsigned long intnumber,
 				  &ebx, &edx, &ecx, &eax, &flags);
 		break;
 	default:
-		printk_info("BIOSINT: Unsupport int #0x%x\n", intnumber);
+		printk_info("BIOSINT: Unsupport int #0x%lx\n", intnumber);
 		break;
 	}
 	if (ret)
Index: svn/src/southbridge/amd/rs780/rs780_pcie.c
===================================================================
--- svn.orig/src/southbridge/amd/rs780/rs780_pcie.c
+++ svn/src/southbridge/amd/rs780/rs780_pcie.c
@@ -255,7 +255,7 @@ void rs780_gpp_sb_init(device_t nb_dev, 
 	u32 gfx_gpp_sb_sel;
 	struct southbridge_amd_rs780_config *cfg =
 	    (struct southbridge_amd_rs780_config *)nb_dev->chip_info;
-	printk_debug("gpp_sb_init nb_dev=0x%p, dev=0x%p, port=0x%p\n", nb_dev, dev, port);
+	printk_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 */
Index: svn/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c
===================================================================
--- svn.orig/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c
+++ svn/src/southbridge/broadcom/bcm5785/bcm5785_lpc.c
@@ -86,7 +86,7 @@ static void bcm5785_lpc_enable_childrens
 					if(!(res->flags & IORESOURCE_IO)) continue;
 		        	        base = res->base;
                 			end = resource_end(res);
-					printk_debug("bcm5785lpc decode:%s, base=0x%08x, end=0x%08x\r\n",dev_path(child),base, end);
+					printk_debug("bcm5785lpc decode:%s, base=0x%08lx, end=0x%08lx\r\n",dev_path(child),base, end);
 					switch(base) {
 					case 0x60: //KBC
 					case 0x64:
Index: svn/src/southbridge/intel/i82870/p64h2_ioapic.c
===================================================================
--- svn.orig/src/southbridge/intel/i82870/p64h2_ioapic.c
+++ svn/src/southbridge/intel/i82870/p64h2_ioapic.c
@@ -62,7 +62,7 @@ static void p64h2_ioapic_init(device_t d
     pIndexRegister  = (volatile uint32_t*) memoryBase;
     pWindowRegister = (volatile uint32_t*)(memoryBase + 0x10);
 
-    printk_debug("IOAPIC %d at %02x:%02x.%01x  MBAR = %x DataAddr = %x\n",
+    printk_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);
 
Index: svn/src/southbridge/nvidia/mcp55/mcp55_aza.c
===================================================================
--- svn.orig/src/southbridge/nvidia/mcp55/mcp55_aza.c
+++ svn/src/southbridge/nvidia/mcp55/mcp55_aza.c
@@ -230,7 +230,7 @@ static void aza_init(struct device *dev)
 		return;
 
 	base =(uint8_t *) res->base;
-	printk_debug("base = %08x\n", base);
+	printk_debug("base = %p\n", base);
 
 	codec_mask = codec_detect(base);
 
Index: svn/src/southbridge/nvidia/mcp55/mcp55_lpc.c
===================================================================
--- svn.orig/src/southbridge/nvidia/mcp55/mcp55_lpc.c
+++ svn/src/southbridge/nvidia/mcp55/mcp55_lpc.c
@@ -80,7 +80,7 @@ static void enable_hpet(struct device *d
 
 	pci_write_config32(dev,0x44, 0xfed00001);
 	hpet_address=pci_read_config32(dev,0x44)& 0xfffffffe;
-	printk_debug("enabling HPET @0x%x\n", hpet_address);
+	printk_debug("enabling HPET @0x%lx\n", hpet_address);
 }
 
 static void lpc_init(device_t dev)
@@ -224,7 +224,7 @@ static void mcp55_lpc_enable_childrens_r
 					if(!(res->flags & IORESOURCE_IO)) continue;
 					base = res->base;
 					end = resource_end(res);
-					printk_debug("mcp55 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end);
+					printk_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;
Index: svn/src/southbridge/ricoh/rl5c476/rl5c476.c
===================================================================
--- svn.orig/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ svn/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -189,7 +189,7 @@ void rl5c476_set_resources(device_t dev)
 		resource = find_resource(dev,1);
 		if( !(resource->flags & IORESOURCE_STORED) ){
 			resource->flags |= IORESOURCE_STORED ;
-			printk_debug("%s 1 ==> %x\n", dev_path(dev), resource->base); 
+			printk_debug("%s 1 ==> %llx\n", dev_path(dev), resource->base);
 			cf_base = resource->base;
 		}
 	}
Index: svn/src/southbridge/sis/sis966/sis966_aza.c
===================================================================
--- svn.orig/src/southbridge/sis/sis966/sis966_aza.c
+++ svn/src/southbridge/sis/sis966/sis966_aza.c
@@ -117,7 +117,7 @@ static int codec_detect(uint8_t *base)
 		return 0;
        }
 
-	 printk_debug("Codec ID = %lx\n", dword);
+	 printk_debug("Codec ID = %x\n", dword);
 
        dword=0x1;
 	return dword;
@@ -293,7 +293,7 @@ static void aza_init(struct device *dev)
 		return;
 
 	base =(uint8_t *) res->base;
-	printk_debug("base = %08x\n", base);
+	printk_debug("base = %p\n", base);
 
 	codec_mask = codec_detect(base);
 
Index: svn/src/southbridge/sis/sis966/sis966_lpc.c
===================================================================
--- svn.orig/src/southbridge/sis/sis966/sis966_lpc.c
+++ svn/src/southbridge/sis/sis966/sis966_lpc.c
@@ -214,7 +214,7 @@ static void sis966_lpc_enable_childrens_
 					if(!(res->flags & IORESOURCE_IO)) continue;
 					base = res->base;
 					end = resource_end(res);
-					printk_debug("sis966 lpc decode:%s, base=0x%08x, end=0x%08x\n",dev_path(child),base, end);
+					printk_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;
Index: svn/src/southbridge/sis/sis966/sis966_nic.c
===================================================================
--- svn.orig/src/southbridge/sis/sis966/sis966_nic.c
+++ svn/src/southbridge/sis/sis966/sis966_nic.c
@@ -274,7 +274,7 @@ static void nic_init(struct device *dev)
 		return;
 	}
 	base = res->base;
-        printk_debug("NIC base address %lx\n",base);
+        printk_debug("NIC base address %x\n",base);
 
 	if(!(val=phy_detect(base,&PhyAddr)))
 	{
@@ -291,7 +291,7 @@ static void nic_init(struct device *dev)
 
           //	if that is valid we will use that
 
-			printk_debug("EEPROM contents %x \n",ReadEEprom( dev,  base,  0LL));
+			printk_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);
Index: svn/src/southbridge/sis/sis966/sis966_usb2.c
===================================================================
--- svn.orig/src/southbridge/sis/sis966/sis966_usb2.c
+++ svn/src/southbridge/sis/sis966/sis966_usb2.c
@@ -95,7 +95,7 @@ static void usb2_init(struct device *dev
                 return;
 
         base =(uint8_t *) res->base;
-        printk_debug("base = %08x\n", base);
+        printk_debug("base = %p\n", base);
         write32(base+0x20, 0x2);
 //-----------------------------------------------------------
 
Index: svn/src/superio/via/vt1211/vt1211.c
===================================================================
--- svn.orig/src/superio/via/vt1211/vt1211.c
+++ svn/src/superio/via/vt1211/vt1211.c
@@ -148,7 +148,7 @@ void vt1211_pnp_set_resources(struct dev
 	for(i = 0; i < dev->resources; i++) {
 		resource = &dev->resource[i];
 		if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-			printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
+			printk_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 @@ void vt1211_pnp_set_resources(struct dev
 			pnp_set_irq(dev, resource->index, resource->base);
 		}
 		else {
-			printk_err("ERROR: %s %02x unknown resource type\n",
+			printk_err("ERROR: %s %02lx unknown resource type\n",
 				dev_path(dev), resource->index);
 			return;
 		}
Index: svn/src/mainboard/amd/dbm690t/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/dbm690t/romstage.c
+++ svn/src/mainboard/amd/dbm690t/romstage.c
@@ -188,7 +188,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
Index: svn/src/mainboard/amd/mahogany/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany/romstage.c
+++ svn/src/mainboard/amd/mahogany/romstage.c
@@ -186,7 +186,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
Index: svn/src/mainboard/amd/mahogany_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/mahogany_fam10/romstage.c
+++ svn/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -184,9 +184,9 @@ void cache_as_ram_main(unsigned long bis
 	// Load MPB
 	val = cpuid_eax(1);
 	printk_debug("BSP Family_Model: %08x \n", val);
-	printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+	printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 	printk_debug("bsp_apicid = %02x \n", bsp_apicid);
-	printk_debug("cpu_init_detectedx = %08x \n", cpu_init_detectedx);
+	printk_debug("cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
 	/* Setup sysinfo defaults */
 	set_sysinfo_in_ram(0);
Index: svn/src/mainboard/amd/pistachio/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/pistachio/romstage.c
+++ svn/src/mainboard/amd/pistachio/romstage.c
@@ -193,7 +193,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
 
Index: svn/src/mainboard/amd/serengeti_cheetah/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah/romstage.c
+++ svn/src/mainboard/amd/serengeti_cheetah/romstage.c
@@ -208,7 +208,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         setup_mb_resource_map();
 #if 0
Index: svn/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ svn/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -186,9 +186,9 @@ void cache_as_ram_main(unsigned long bis
 	// Load MPB
 	val = cpuid_eax(1);
 	printk_debug("BSP Family_Model: %08x \n", val);
-	printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+	printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 	printk_debug("bsp_apicid = %02x \n", bsp_apicid);
-	printk_debug("cpu_init_detectedx = %08x \n", cpu_init_detectedx);
+	printk_debug("cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
 	/* Setup sysinfo defaults */
 	set_sysinfo_in_ram(0);
Index: svn/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ svn/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -218,7 +218,7 @@ void cache_as_ram_main(unsigned long bis
 	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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
 
Index: svn/src/mainboard/gigabyte/m57sli/romstage.c
===================================================================
--- svn.orig/src/mainboard/gigabyte/m57sli/romstage.c
+++ svn/src/mainboard/gigabyte/m57sli/romstage.c
@@ -232,7 +232,7 @@ void cache_as_ram_main(unsigned long bis
 	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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
 
Index: svn/src/mainboard/hp/dl145_g3/romstage.c
===================================================================
--- svn.orig/src/mainboard/hp/dl145_g3/romstage.c
+++ svn/src/mainboard/hp/dl145_g3/romstage.c
@@ -236,7 +236,7 @@ void cache_as_ram_main(unsigned long bis
 	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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
 	print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
 
Index: svn/src/mainboard/iwill/dk8_htx/romstage.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8_htx/romstage.c
+++ svn/src/mainboard/iwill/dk8_htx/romstage.c
@@ -168,7 +168,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         setup_mb_resource_map();
 
Index: svn/src/mainboard/iwill/dk8s2/romstage.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8s2/romstage.c
+++ svn/src/mainboard/iwill/dk8s2/romstage.c
@@ -168,7 +168,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         setup_default_resource_map();
 
Index: svn/src/mainboard/iwill/dk8x/romstage.c
===================================================================
--- svn.orig/src/mainboard/iwill/dk8x/romstage.c
+++ svn/src/mainboard/iwill/dk8x/romstage.c
@@ -167,7 +167,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         setup_default_resource_map();
 
Index: svn/src/mainboard/kontron/kt690/romstage.c
===================================================================
--- svn.orig/src/mainboard/kontron/kt690/romstage.c
+++ svn/src/mainboard/kontron/kt690/romstage.c
@@ -191,7 +191,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
Index: svn/src/mainboard/msi/ms7260/romstage.c
===================================================================
--- svn.orig/src/mainboard/msi/ms7260/romstage.c
+++ svn/src/mainboard/msi/ms7260/romstage.c
@@ -190,12 +190,7 @@ void cache_as_ram_main(unsigned long bis
 #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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 	print_debug("bsp_apicid=");
 	print_debug_hex8(bsp_apicid);
 	print_debug("\r\n");
Index: svn/src/mainboard/msi/ms9185/romstage.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9185/romstage.c
+++ svn/src/mainboard/msi/ms9185/romstage.c
@@ -203,7 +203,7 @@ void cache_as_ram_main(unsigned long bis
        /* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
        setup_ms9185_resource_map();
 #if 0
Index: svn/src/mainboard/msi/ms9652_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/msi/ms9652_fam10/romstage.c
+++ svn/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -212,9 +212,9 @@ void cache_as_ram_main(unsigned long bis
 
 	val = cpuid_eax(1);
 	printk_debug("BSP Family_Model: %08x\n", val);
-	printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+	printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 	printk_debug("bsp_apicid = %02x\n", bsp_apicid);
-	printk_debug("cpu_init_detectedx = %08x\n", cpu_init_detectedx);
+	printk_debug("cpu_init_detectedx = %08lx\n", cpu_init_detectedx);
 
 	/* Setup sysinfo defaults */
 	set_sysinfo_in_ram(0);
Index: svn/src/mainboard/nvidia/l1_2pvv/romstage.c
===================================================================
--- svn.orig/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ svn/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -218,7 +218,7 @@ void cache_as_ram_main(unsigned long bis
 	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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
 	print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
 
Index: svn/src/mainboard/supermicro/h8dme/romstage.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dme/romstage.c
+++ svn/src/mainboard/supermicro/h8dme/romstage.c
@@ -270,11 +270,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
 	setup_mb_resource_map();
 
Index: svn/src/mainboard/supermicro/h8dmr/romstage.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr/romstage.c
+++ svn/src/mainboard/supermicro/h8dmr/romstage.c
@@ -203,7 +203,7 @@ void cache_as_ram_main(unsigned long bis
 	/* 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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
         setup_mb_resource_map();
 
Index: svn/src/mainboard/supermicro/h8dmr_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ svn/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -205,9 +205,9 @@ void cache_as_ram_main(unsigned long bis
 
  val = cpuid_eax(1);
  printk_debug("BSP Family_Model: %08x \n", val);
- printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+ printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
  printk_debug("bsp_apicid = %02x \n", bsp_apicid);
- printk_debug("cpu_init_detectedx = %08x \n", cpu_init_detectedx);
+ printk_debug("cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
  /* Setup sysinfo defaults */
  set_sysinfo_in_ram(0);
Index: svn/src/mainboard/supermicro/h8qme_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ svn/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -248,9 +248,9 @@ void cache_as_ram_main(unsigned long bis
 
  val = cpuid_eax(1);
  printk_debug("BSP Family_Model: %08x \n", val);
- printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+ printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
  printk_debug("bsp_apicid = %02x \n", bsp_apicid);
- printk_debug("cpu_init_detectedx = %08x \n", cpu_init_detectedx);
+ printk_debug("cpu_init_detectedx = %08lx \n", cpu_init_detectedx);
 
  /* Setup sysinfo defaults */
  set_sysinfo_in_ram(0);
Index: svn/src/mainboard/technexion/tim5690/romstage.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim5690/romstage.c
+++ svn/src/mainboard/technexion/tim5690/romstage.c
@@ -198,7 +198,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
Index: svn/src/mainboard/technexion/tim8690/romstage.c
===================================================================
--- svn.orig/src/mainboard/technexion/tim8690/romstage.c
+++ svn/src/mainboard/technexion/tim8690/romstage.c
@@ -190,7 +190,7 @@ void cache_as_ram_main(unsigned long bis
 	allow_all_aps_stop(bsp_apicid);
 
 	/* It's the time to set ctrl now; */
-	printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+	printk_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);
Index: svn/src/mainboard/tyan/s2912/romstage.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912/romstage.c
+++ svn/src/mainboard/tyan/s2912/romstage.c
@@ -214,7 +214,7 @@ void cache_as_ram_main(unsigned long bis
 	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_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 
 	print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n");
 
Index: svn/src/mainboard/tyan/s2912_fam10/romstage.c
===================================================================
--- svn.orig/src/mainboard/tyan/s2912_fam10/romstage.c
+++ svn/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -210,9 +210,9 @@ void cache_as_ram_main(unsigned long bis
 
 	val = cpuid_eax(1);
 	printk_debug("BSP Family_Model: %08x\n", val);
-	printk_debug("*sysinfo range: ["); print_debug_hex32((u32)sysinfo); print_debug(","); print_debug_hex32((u32)sysinfo+sizeof(struct sys_info)); print_debug("]\n");
+	printk_debug("*sysinfo range: [%p,%p]\n",sysinfo,sysinfo+1);
 	printk_debug("bsp_apicid = %02x\n", bsp_apicid);
-	printk_debug("cpu_init_detectedx = %08x\n", cpu_init_detectedx);
+	printk_debug("cpu_init_detectedx = %08lx\n", cpu_init_detectedx);
 
 	/* Setup sysinfo defaults */
 	set_sysinfo_in_ram(0);
Index: svn/src/northbridge/amd/amdfam10/debug.c
===================================================================
--- svn.orig/src/northbridge/amd/amdfam10/debug.c
+++ svn/src/northbridge/amd/amdfam10/debug.c
@@ -28,7 +28,7 @@ static void udelay_tsc(u32 us);
 static  void print_debug_addr(const char *str, void *val)
 {
 #if CACHE_AS_RAM_ADDRESS_DEBUG == 1
-		printk_debug("------Address debug: %s%x------\n", str, val);
+		printk_debug("------Address debug: %s%p------\n", str, val);
 #endif
 }
 
Index: svn/src/northbridge/amd/amdk8/raminit_f_dqs.c
===================================================================
--- svn.orig/src/northbridge/amd/amdk8/raminit_f_dqs.c
+++ svn/src/northbridge/amd/amdk8/raminit_f_dqs.c
@@ -1700,7 +1700,7 @@ static unsigned int range_to_mtrr(unsign
 		}
 		sizek = 1 << align;
 #if CONFIG_MEM_TRAIN_SEQ != 1
-		printk_debug("Setting variable MTRR %d, base: %4dMB, range: %4dMB, type %s\r\n",
+		printk_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")
Index: svn/src/southbridge/sis/sis966/sis966_early_smbus.c
===================================================================
--- svn.orig/src/southbridge/sis/sis966/sis966_early_smbus.c
+++ svn/src/southbridge/sis/sis966/sis966_early_smbus.c
@@ -484,7 +484,7 @@ void sis_init_stage2(void)
         printk_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_debug("Memory Top Bound %lx\n",msr.lo );
+	 printk_debug("Memory Top Bound %x\n",msr.lo );
 
         temp16=(pci_read_config8(dev, 0x4C) & 0xE0) >> 5;
         temp16=0x0001<<(temp16-1);
Index: svn/src/mainboard/intel/d945gclf/acpi_tables.c
===================================================================
--- svn.orig/src/mainboard/intel/d945gclf/acpi_tables.c
+++ svn/src/mainboard/intel/d945gclf/acpi_tables.c
@@ -299,7 +299,7 @@ unsigned long write_acpi_tables(unsigned
 	/* Pack GNVS into the ACPI table area */
 	for (i=0; i < dsdt->length; i++) {
 		if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) {
-			printk_debug("ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, current);
+			printk_debug("ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08lx\n", i, current);
 			*(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes
 			break;
 		}
Index: svn/src/southbridge/intel/i82801ax/i82801ax_lpc.c
===================================================================
--- svn.orig/src/southbridge/intel/i82801ax/i82801ax_lpc.c
+++ svn/src/southbridge/intel/i82801ax/i82801ax_lpc.c
@@ -74,7 +74,7 @@ typedef struct southbridge_intel_i82801a
  * 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 @@ void i82801ax_enable_apic(struct device 
 	*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 @@ static void gpio_init(device_t dev, uint
 	}
 }
 
-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 @@ void i82801ax_rtc_init(struct device *de
 	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;
