10 files changed, 13 insertions, 14 deletions
diff --git a/src/northbridge/amd/amdfam10/setup_resource_map.c b/src/northbridge/amd/amdfam10/setup_resource_map.c
index 0d6d743750..31daa68b51 100644
--- a/src/northbridge/amd/amdfam10/setup_resource_map.c
+++ b/src/northbridge/amd/amdfam10/setup_resource_map.c
@@ -195,6 +195,7 @@ static void setup_resource_map_x(const u32 *register_values, u32 max)
 #endif
 }
 
+#if 0
 static void setup_iob_resource_map(const u32 *register_values, u32 max)
 {
 	u32 i;
@@ -227,5 +228,5 @@ static void setup_io_resource_map(const u32 *register_values, u32 max)
 		outl(reg, where);
 	}
 }
-
+#endif
 
diff --git a/src/northbridge/amd/amdk8/incoherent_ht.c b/src/northbridge/amd/amdk8/incoherent_ht.c
index 6a85516211..b4e3d64d63 100644
--- a/src/northbridge/amd/amdk8/incoherent_ht.c
+++ b/src/northbridge/amd/amdk8/incoherent_ht.c
@@ -444,7 +444,6 @@ end_of_chain: ;
 #if CONFIG_HT_CHAIN_END_UNITID_BASE != 0x20
 	if(offset_unitid && (ht_dev_num>1) && (real_last_unitid != CONFIG_HT_CHAIN_END_UNITID_BASE) && !end_used ) {
 		uint16_t flags;
-		int i;
 		flags = pci_read_config16(PCI_DEV(bus,real_last_unitid,0), real_last_pos + PCI_CAP_FLAGS);
 		flags &= ~0x1f;
 		flags |= CONFIG_HT_CHAIN_END_UNITID_BASE & 0x1f;
@@ -452,6 +451,7 @@ end_of_chain: ;
 
 		#if RAMINIT_SYSINFO == 1
 		// Here need to change the dev in the array
+		int i;
 		for(i=0;i<sysinfo->link_pair_num;i++)
 		{
 			struct link_pair_st *link_pair = &sysinfo->link_pair[i];
diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c
index cac9f80097..eaeff9ee9c 100644
--- a/src/northbridge/amd/amdk8/raminit_f.c
+++ b/src/northbridge/amd/amdk8/raminit_f.c
@@ -33,7 +33,7 @@
 #define QRANK_DIMM_SUPPORT 0
 #endif
 
-#if DEBUG_RAM_SETUP
+#if CONFIG_DEBUG_RAM_SETUP
 #define printk_raminit(fmt, arg...) printk(BIOS_DEBUG, fmt, arg)
 #else
 #define printk_raminit(fmt, arg...)
diff --git a/src/northbridge/amd/amdk8/setup_resource_map.c b/src/northbridge/amd/amdk8/setup_resource_map.c
index ec3c0cf919..96f1c5dca6 100644
--- a/src/northbridge/amd/amdk8/setup_resource_map.c
+++ b/src/northbridge/amd/amdk8/setup_resource_map.c
@@ -192,6 +192,7 @@ static void setup_resource_map_x(const unsigned int *register_values, int max)
 #endif
 }
 
+#if 0
 static void setup_iob_resource_map(const unsigned int *register_values, int max)
 {
 	int i;
@@ -267,7 +268,6 @@ static void setup_io_resource_map(const unsigned int *register_values, int max)
 	}
 }
 
-#if 0
 static void setup_mem_resource_map(const unsigned int *register_values, int max)
 {
 	int i;
diff --git a/src/northbridge/via/cn400/cn400.h b/src/northbridge/via/cn400/cn400.h
index 3c9e8fd52a..baa58a1206 100644
--- a/src/northbridge/via/cn400/cn400.h
+++ b/src/northbridge/via/cn400/cn400.h
@@ -19,7 +19,8 @@
  */
 
 #ifndef __PRE_RAM__
-static void cn400_noop(void)
+// HACK
+static inline void cn400_noop(device_t dev)
 {
 }
 #endif
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index 5aec00835f..f867427824 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -238,7 +238,7 @@ static void cn400_domain_set_resources(device_t dev)
 	if (mc_dev) {
 		unsigned long tomk, tolmk;
 		unsigned char rambits;
-		int i, idx;
+		int idx;
 
 		rambits = pci_read_config8(mc_dev, 0x47);
 		tomk = rambits * 32 * 1024;
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index 3144395180..7d33e44236 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -105,7 +105,7 @@ static const struct pci_driver agp_driver __pci_driver = {
 static void vga_init(device_t dev)
 {
 //	unsigned long fb;
-	msr_t clocks1,clocks2,instructions,setup;
+	//msr_t clocks1,clocks2,instructions,setup;
 
 	printk(BIOS_DEBUG, "VGA random fixup ...\n");
 	pci_write_config8(dev, 0x04, 0x07);
diff --git a/src/northbridge/via/vt8623/raminit.c b/src/northbridge/via/vt8623/raminit.c
index 40338dae7e..f57127b3da 100644
--- a/src/northbridge/via/vt8623/raminit.c
+++ b/src/northbridge/via/vt8623/raminit.c
@@ -69,7 +69,7 @@ static void ddr_ram_setup(const struct mem_controller *ctrl)
 {
 	device_t north = (device_t) 0;
 	uint8_t b, c, bank;
-	uint16_t i,j;
+	uint16_t i;
 	unsigned long bank_address;
 
 	print_debug("vt8623 init starting\n");
diff --git a/src/northbridge/via/vx800/vx800.h b/src/northbridge/via/vx800/vx800.h
index 5e1c4df205..1d832508ac 100644
--- a/src/northbridge/via/vx800/vx800.h
+++ b/src/northbridge/via/vx800/vx800.h
@@ -21,7 +21,7 @@
 #define  VX800_H 1
 
 #ifndef __PRE_RAM__
-static void vx800_noop()
+static inline void vx800_noop(device_t dev)
 {
 }
 #endif
diff --git a/src/northbridge/via/vx800/vx800_ide.c b/src/northbridge/via/vx800/vx800_ide.c
index b3d6bc2c02..b4c40d4e2f 100644
--- a/src/northbridge/via/vx800/vx800_ide.c
+++ b/src/northbridge/via/vx800/vx800_ide.c
@@ -166,13 +166,10 @@ static const idedevicepcitable[16 * 12] = {
 
 static void ide_init(struct device *dev)
 {
-	uint8_t enables, Rx89, RxC0;
 	u8 i, data;
-	struct ATA_REG_INIT_TABLE *pEntry;
 	printk(BIOS_INFO, "ide_init\n");
 
-#if 1
-	/*these 3 lines help to keep interl back door for DID VID SUBID untouched */
+	/* these 3 lines help to keep interl back door for DID VID SUBID untouched */
 	u16 data16_1, data16_2;
 	data16_1 = pci_read_config16(dev, 0xba);
 	data16_2 = pci_read_config16(dev, 0xbe);
@@ -189,7 +186,7 @@ static void ide_init(struct device *dev)
 	//these 2 lines help to keep interl back door for DID VID SUBID untouched
 	pci_write_config16(dev, 0xba, data16_1);
 	pci_write_config16(dev, 0xbe, data16_2);
-#endif
+
 	/* Force interrupts to use compat mode. */
 	pci_write_config8(dev, PCI_INTERRUPT_PIN, 0x0);
 	pci_write_config8(dev, PCI_INTERRUPT_LINE, 0xff);