Remove warnings from compilation of the s2892 with and without CBFS.

I didn't try to remove "defined but not used" warnings because there are too
many ifdefs to be sure I wouldn't break something.

For shadowed variable declarations I renamed the inner-most variable.

The one in src/pc80/keyboard.c might need help.  I didn't change the
functionality but it looks like a bug.

I boot tested it on s2892 and abuild tested it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4240 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index b134e386e43d6171701450d3cbd51fd99e730772..8ca3b877d2dfb7bb5d95c9ef624352745237c35f 100644 (file)
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -428,7 +428,7 @@ unsigned long write_coreboot_table(
        printk_debug("Writing high table forward entry at 0x%08lx\n",
                        low_table_end);
        head = lb_table_init(low_table_end);
-       lb_forward(head, rom_table_end);
+       lb_forward(head, (struct lb_header*)rom_table_end);
        lb_table_fini(head, 0);
 
        low_table_end = (unsigned long)head;

diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 5083f20564f874bed432d1dc48e2dd5da32626af..6c13a3de159136fcfe44bd71b463262de31a5b74 100644 (file)
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -66,7 +66,7 @@ struct lb_memory *write_tables(void)
 {
        unsigned long low_table_start, low_table_end;
        unsigned long rom_table_start, rom_table_end;
-#if HAVE_MP_TABLE == 1
+#if HAVE_MP_TABLE == 1 && HAVE_LOW_TABLES == 1
        unsigned long new_low_table_end;
 #endif
 
@@ -114,16 +114,16 @@ struct lb_memory *write_tables(void)
         */
 #if HAVE_ACPI_TABLES == 1
 #if HAVE_HIGH_TABLES == 1
-       unsigned long high_rsdp=ALIGN(high_table_end, 16);
-       if (high_tables_base) {
-               high_table_end = write_acpi_tables(high_table_end);
-               high_table_end = (high_table_end+1023) & ~1023;
-       }
 #if HAVE_LOW_TABLES == 1
+       unsigned long high_rsdp=ALIGN(high_table_end, 16);
        unsigned long rsdt_location=(unsigned long*)(((acpi_rsdp_t*)high_rsdp)->rsdt_address);
        acpi_write_rsdp(rom_table_end, rsdt_location);
        rom_table_end = ALIGN(ALIGN(rom_table_end, 16) + sizeof(acpi_rsdp_t), 16);
 #endif
+       if (high_tables_base) {
+               high_table_end = write_acpi_tables(high_table_end);
+               high_table_end = (high_table_end+1023) & ~1023;
+       }
 #else
 #if HAVE_LOW_TABLES == 1
        rom_table_end = write_acpi_tables(rom_table_end);

diff --git a/src/arch/i386/include/arch/smp/mpspec.h b/src/arch/i386/include/arch/smp/mpspec.h
index 0e8e3553c3124e11006ab67de4a1503c7183ef23..4ddee0d7c7013fedd804d1cbadcbdad1c27a4235 100644 (file)
--- a/src/arch/i386/include/arch/smp/mpspec.h
+++ b/src/arch/i386/include/arch/smp/mpspec.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_MPSPEC_H
 #define __ASM_MPSPEC_H
 
+#include <device/device.h>
 /*
  * Structure definitions for SMP machines following the
  * Intel Multiprocessing Specification 1.1 and 1.4.

diff --git a/src/arch/i386/smp/mpspec.c b/src/arch/i386/smp/mpspec.c
index 6746399d028dcee8ab7ffc7ad83251eb3ff46021..6c2585a535114b6ee6d9c3acc01b3816ab6c7215 100644 (file)
--- a/src/arch/i386/smp/mpspec.c
+++ b/src/arch/i386/smp/mpspec.c
@@ -1,5 +1,4 @@
 #include <console/console.h>
-#include <device/device.h>
 #include <device/path.h>
 #include <device/pci_ids.h>
 #include <cpu/cpu.h>
@@ -23,9 +22,6 @@ unsigned char smp_compute_checksum(void *v, int len)
 
 void *smp_write_floating_table(unsigned long addr)
 {
-       struct intel_mp_floating *mf;
-       void *v;
-       
        /* 16 byte align the table address */
        addr = (addr + 0xf) & (~0xf);
        return smp_write_floating_table_physaddr(addr, addr + SMP_FLOATING_TABLE_LEN);

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index d6e88de374be28165cefa4644092745fa7d57502..2419dc2134e707a0789fcaa47f6d9f44cb79a744 100644 (file)
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -99,9 +99,9 @@ void hardwaremain(int boot_complete)
        lb_mem = write_tables();
 #if CONFIG_CBFS == 1
 # if USE_FALLBACK_IMAGE == 1
-       void (*pl)(void) = cbfs_load_payload(lb_mem, "fallback/payload");
+       cbfs_load_payload(lb_mem, "fallback/payload");
 # else
-       void (*pl)(void) = cbfs_load_payload(lb_mem, "normal/payload");
+       cbfs_load_payload(lb_mem, "normal/payload");
 # endif
 #else
 

diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c
index 72fb49fcad3a554ba3701ad2a0ec88d53cd9c5f4..ae1ea0a09618913bf9ed35a9f6b8f7cd7d8d8bca 100644 (file)
--- a/src/boot/selfboot.c
+++ b/src/boot/selfboot.c
@@ -302,7 +302,6 @@ static int build_self_segment_list(
 {
        struct segment *new;
        struct segment *ptr;
-       u8 *data;
        int datasize;
        struct cbfs_payload_segment *segment, *first_segment;
        memset(head, 0, sizeof(*head));
@@ -352,7 +351,7 @@ static int build_self_segment_list(
 
                case PAYLOAD_SEGMENT_ENTRY:
                        printk_info("Entry %p\n", (void *) ntohl((u32) segment->load_addr));
-                       *entry =  (void *) ntohl((u32) segment->load_addr);
+                       *entry =  ntohl((u32) segment->load_addr);
                        return 1;
                }
                segment++;
@@ -392,15 +391,13 @@ static int load_self_segments(
        
        offset = 0;
        for(ptr = head->next; ptr != head; ptr = ptr->next) {
-               unsigned long skip_bytes, read_bytes;
                unsigned char *dest, *middle, *end, *src;
-               byte_offset_t result;
                printk_debug("Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n",
                        ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz);
                
                /* Compute the boundaries of the segment */
                dest = (unsigned char *)(ptr->s_dstaddr);
-               src = ptr->s_srcaddr;
+               src = (unsigned char *)(ptr->s_srcaddr);
                
                /* Copy data from the initial buffer */
                if (ptr->s_filesz) {
@@ -451,13 +448,11 @@ static int load_self_segments(
                }
        }
        return 1;
- out:
-       return 0;
 }
 
 int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
 {
-       void *entry;
+       u32 entry=0;
        struct segment head;
        unsigned long bounce_buffer;
 
@@ -481,11 +476,11 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload)
        /* Reset to booting from this image as late as possible */
        boot_successful();
 
-       printk_debug("Jumping to boot code at %p\n", entry);
+       printk_debug("Jumping to boot code at %x\n", entry);
        post_code(0xfe);
 
        /* Jump to kernel */
-       jmp_to_elf_entry(entry, bounce_buffer);
+       jmp_to_elf_entry((void*)entry, bounce_buffer);
        return 1;
 
  out:

diff --git a/src/cpu/amd/dualcore/amd_sibling.c b/src/cpu/amd/dualcore/amd_sibling.c
index 15c319c4a9b62122ad3a4d653cc13d0b538b240a..899b859d4f9eef8998c443357ea88e9362314fc4 100644 (file)
--- a/src/cpu/amd/dualcore/amd_sibling.c
+++ b/src/cpu/amd/dualcore/amd_sibling.c
@@ -62,9 +62,6 @@ unsigned get_apicid_base(unsigned ioapic_num)
        unsigned nb_cfg_54;
         int bsp_apic_id = lapicid(); // bsp apicid
 
-        int disable_siblings = !CONFIG_LOGICAL_CPUS;
-
-
         get_option(&disable_siblings, "dual_core");
 
         //get the nodes number

diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 1562114b396682e80482bd118db5f31819d8d3e8..a7949f0b9cd7f7b8db756d90d36326685225dfe4 100644 (file)
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -252,8 +252,8 @@ int start_cpu(device_t cpu)
        } else {
                // for all APs, let use stack after pgtbl, 20480 is the pgtbl size for every cpu
                stack_end = 0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPUS - (STACK_SIZE*index);
-#if (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPU) > (CONFIG_LB_MEM_TOPK<<10)
-               #warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPU)\n"
+#if (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPUS) > (CONFIG_LB_MEM_TOPK<<10)
+               #warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+(20480 + STACK_SIZE)*CONFIG_MAX_CPUS)\n"
 #endif
                if(stack_end > (CONFIG_LB_MEM_TOPK<<10)) {
                        printk_debug("start_cpu: Please increase the CONFIG_LB_MEM_TOPK more than %luK\n", stack_end>>10);

diff --git a/src/cpu/x86/pae/pgtbl.c b/src/cpu/x86/pae/pgtbl.c
index 2ccee666d8b0eddb5682034e3502796169c7d1ca..7c1699a3821ac6f10e9844c8d69a16dc06e6bda4 100644 (file)
--- a/src/cpu/x86/pae/pgtbl.c
+++ b/src/cpu/x86/pae/pgtbl.c
@@ -59,11 +59,11 @@ void *map_2M_page(unsigned long page)
         pgtbl is too big, so use last one 1M before CONFIG_LB_MEM_TOP, otherwise for 8 way dual core with vga support will push stack and heap cross 0xa0000, 
         and that region need to be used as vga font buffer. Please make sure set CONFIG_LB_MEM_TOPK=2048 in MB Config
        */
-       struct pg_table *pgtbl = 0x100000; //1M
+       struct pg_table *pgtbl = (struct pg_table*)0x100000; //1M
 
        unsigned x_end = 0x100000 + sizeof(struct pg_table) * CONFIG_MAX_CPUS;
-#if (0x100000+20480*CONFIG_MAX_CPU) > (CONFIG_LB_MEM_TOPK<<10)
-                #warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+20480*CONFIG_MAX_CPU)\n"
+#if (0x100000+20480*CONFIG_MAX_CPUS) > (CONFIG_LB_MEM_TOPK<<10)
+                #warning "We may need to increase CONFIG_LB_MEM_TOPK, it need to be more than (0x100000+20480*CONFIG_MAX_CPUS)\n"
 #endif
        if(x_end > (CONFIG_LB_MEM_TOPK<<10)) {
                         printk_debug("map_2M_page: Please increase the CONFIG_LB_MEM_TOPK more than %dK\n", x_end>>10);

diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index 3449fe93f6a6fed0a3f65d65950f681d6a7552b6..adc3f5ab64dd3cc14f7d2eed0c9f18a68caed78e 100644 (file)
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -49,6 +49,7 @@
 #ifndef _CBFS_H_
 #define _CBFS_H_
 
+#include <boot/coreboot_tables.h>
 /** These are standard values for the known compression
     alogrithms that coreboot knows about for stages and
     payloads.  Of course, other LAR users can use whatever

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 3a79502fbbd88c4f26e2b9123dbaaed6b0c1d085..4c025d14729b19d949f3628664e1e675c897eead 100644 (file)
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -20,7 +20,6 @@
 #include <types.h>
 #include <string.h>
 #include <console/console.h>
-#include <boot/coreboot_tables.h>
 #include <cbfs.h>
 
 #ifndef CONFIG_BIG_ENDIAN

diff --git a/src/mainboard/tyan/s2892/cache_as_ram_auto.c b/src/mainboard/tyan/s2892/cache_as_ram_auto.c
index 3147e997479a6c88a6aaf5e20deb73b29d41c032..bafd6e9c9b49cae4a3a5ae9f7b99e9c7e42d2c08 100644 (file)
--- a/src/mainboard/tyan/s2892/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2892/cache_as_ram_auto.c
@@ -90,8 +90,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 
 static void sio_setup(void)
 {
-
-       unsigned value;
        uint32_t dword;
        uint8_t byte;
 
@@ -102,7 +100,6 @@ static void sio_setup(void)
        dword = pci_read_config32(PCI_DEV(0, CK804_DEVN_BASE+1 , 0), 0xa0);
        dword |= (1<<0);
        pci_write_config32(PCI_DEV(0, CK804_DEVN_BASE+1 , 0), 0xa0, dword);
-
 }
 
 void failover_process(unsigned long bist, unsigned long cpu_init_detectedx)

diff --git a/src/mainboard/tyan/s2892/cmos.layout b/src/mainboard/tyan/s2892/cmos.layout
index 5eb88b9a5ac2bd3ce7d958cd38f9938678abb538..fa37d683d029deae3fccef27a0003e3c81622061 100644 (file)
--- a/src/mainboard/tyan/s2892/cmos.layout
+++ b/src/mainboard/tyan/s2892/cmos.layout
@@ -46,7 +46,7 @@ entries
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers
-1000        24       r       0        reserved_memory
+1000        24       r       0        reserved_memory1
 
 
 

diff --git a/src/mainboard/tyan/s2892/irq_tables.c b/src/mainboard/tyan/s2892/irq_tables.c
index bb5e8e0307863131ad2eabd2ae9587f8dcafb956..094658669aa47478bb9394134e8375b09ba1e741 100644 (file)
--- a/src/mainboard/tyan/s2892/irq_tables.c
+++ b/src/mainboard/tyan/s2892/irq_tables.c
@@ -65,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
        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);

diff --git a/src/northbridge/amd/amdk8/amdk8.h b/src/northbridge/amd/amdk8/amdk8.h
index 7e2f0b0fc3eec0dbaaa4a1fa02535f1306f36e19..f8d3aaaced6cd17fc1f5b270d7f5511190fb248a 100644 (file)
--- a/src/northbridge/amd/amdk8/amdk8.h
+++ b/src/northbridge/amd/amdk8/amdk8.h
@@ -244,7 +244,6 @@
 #include "raminit.h"
 //struct definitions
 
-#if RAMINIT_SYSINFO==1
 struct link_pair_st {
         device_t udev;
         uint32_t upos;
@@ -267,8 +266,6 @@ struct sys_info {
         uint32_t sblk;
         uint32_t sbbusn;
 } __attribute__((packed));
-#endif
-
 
 #endif
 

diff --git a/src/northbridge/amd/amdk8/amdk8_acpi.c b/src/northbridge/amd/amdk8/amdk8_acpi.c
index 295579166d53792e7119bf097f1adb9b8bb351fd..b6d4ed46f989f8357ac472df9e54eab394929e13 100644 (file)
--- a/src/northbridge/amd/amdk8/amdk8_acpi.c
+++ b/src/northbridge/amd/amdk8/amdk8_acpi.c
@@ -218,8 +218,6 @@ unsigned long acpi_fill_slit(unsigned long current)
 }
 
 static int k8acpi_write_HT(void) {
-       device_t dev;
-       uint32_t dword;
        int len, lenp, i;
 
        len = acpigen_write_name("HCLK");

diff --git a/src/northbridge/amd/amdk8/debug.c b/src/northbridge/amd/amdk8/debug.c
index 3188872ed508db2dd4badcf0df5841c2c11297f0..4ed376ae07fd0c5c409228226d613da1e6a3f49e 100644 (file)
--- a/src/northbridge/amd/amdk8/debug.c
+++ b/src/northbridge/amd/amdk8/debug.c
@@ -3,6 +3,10 @@
  *
  */
 
+#ifndef CACHE_AS_RAM_ADDRESS_DEBUG
+#define CACHE_AS_RAM_ADDRESS_DEBUG 0
+#endif
+
 static inline void print_debug_addr(const char *str, void *val)
 {
 #if CACHE_AS_RAM_ADDRESS_DEBUG == 1

diff --git a/src/northbridge/amd/amdk8/incoherent_ht.c b/src/northbridge/amd/amdk8/incoherent_ht.c
index 4dac99c341201dd155e8d251f7404bca0848f2ae..74c9f4fe4fbed058a01561640fe7c6c405686819 100644 (file)
--- a/src/northbridge/amd/amdk8/incoherent_ht.c
+++ b/src/northbridge/amd/amdk8/incoherent_ht.c
@@ -11,6 +11,10 @@
        #define K8_HT_FREQ_1G_SUPPORT 0
 #endif
 
+#ifndef RAMINIT_SYSINFO
+       #define RAMINIT_SYSINFO 0
+#endif
+
 #ifndef K8_SCAN_PCI_BUS
        #define K8_SCAN_PCI_BUS 0
 #endif
@@ -79,7 +83,6 @@ static uint8_t ht_lookup_host_capability(device_t dev)
 static void ht_collapse_previous_enumeration(uint8_t bus, unsigned offset_unitid)
 {
        device_t dev;
-       uint32_t id;
 
        //actually, only for one HT device HT chain, and unitid is 0
 #if HT_CHAIN_UNITID_BASE == 0
@@ -90,6 +93,7 @@ static void ht_collapse_previous_enumeration(uint8_t bus, unsigned offset_unitid
 
        /* Check if is already collapsed */
        if((!offset_unitid) || (offset_unitid && (!((HT_CHAIN_END_UNITID_BASE == 0) && (HT_CHAIN_END_UNITID_BASE <HT_CHAIN_UNITID_BASE))))) {
+               uint32_t id;
                dev = PCI_DEV(bus, 0, 0);
                id = pci_read_config32(dev, PCI_VENDOR_ID);
                if (!((id == 0xffffffff) || (id == 0x00000000) ||
@@ -556,7 +560,9 @@ static int ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned of
 
        } while (last_unitid != next_unitid );
 
+#if HT_CHAIN_END_UNITID_BASE != 0x20
 out:
+#endif
 end_of_chain: ;
 
 #if HT_CHAIN_END_UNITID_BASE != 0x20

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index ac9dc206348f61c75d1758f1ece9058dac05e8f8..b6c0f7c8c0cbc96a363c2fd28c37df769815252d 100644 (file)
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -288,7 +288,7 @@ static int reg_useable(unsigned reg,
        device_t goal_dev, unsigned goal_nodeid, unsigned goal_link)
 {
        struct resource *res;
-       unsigned nodeid, link;
+       unsigned nodeid, link=0;
        int result;
        res = 0;
        for(nodeid = 0; !res && (nodeid < FX_DEVS); nodeid++) {
@@ -648,16 +648,16 @@ static void pci_domain_read_resources(device_t dev)
                /* Is this register allocated? */
                if ((base & 3) != 0) {
                        unsigned nodeid, link;
-                       device_t dev;
+                       device_t reg_dev;
                        nodeid = limit & 7;
                        link   = (limit >> 4) & 3;
-                       dev = __f0_dev[nodeid];
-                       if (dev) {
+                       reg_dev = __f0_dev[nodeid];
+                       if (reg_dev) {
                                /* Reserve the resource  */
-                               struct resource *resource;
-                               resource = new_resource(dev, 0x100 + (reg | link));
-                               if (resource) {
-                                       resource->flags = 1;
+                               struct resource *reg_resource;
+                               reg_resource = new_resource(reg_dev, 0x100 + (reg | link));
+                               if (reg_resource) {
+                                       reg_resource->flags = 1;
                                }
                        }
                }
@@ -1222,20 +1222,20 @@ static unsigned int cpu_bus_scan(device_t dev, unsigned int max)
        /* Find which cpus are present */
        cpu_bus = &dev->link[0];
        for(i = 0; i < sysconf.nodes; i++) {
-               device_t dev, cpu;
+               device_t cpu_dev, cpu;
                struct device_path cpu_path;
 
                /* Find the cpu's pci device */
-               dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 3));
-               if (!dev) {
+               cpu_dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 3));
+               if (!cpu_dev) {
                        /* If I am probing things in a weird order
                         * ensure all of the cpu's pci devices are found.
                         */
-                       int j;
+                       int local_j;
                        device_t dev_f0;
-                       for(j = 0; j <= 3; j++) {
-                               dev = pci_probe_dev(NULL, dev_mc->bus,
-                                       PCI_DEVFN(0x18 + i, j));
+                       for(local_j = 0; local_j <= 3; local_j++) {
+                               cpu_dev = pci_probe_dev(NULL, dev_mc->bus,
+                                       PCI_DEVFN(0x18 + i, local_j));
                        }
                        /* Ok, We need to set the links for that device.
                         * otherwise the device under it will not be scanned
@@ -1243,19 +1243,19 @@ static unsigned int cpu_bus_scan(device_t dev, unsigned int max)
                        dev_f0 = dev_find_slot(0, PCI_DEVFN(0x18+i,0));
                        if(dev_f0) {
                                dev_f0->links = 3;
-                               for(j=0;j<3;j++) {
-                                       dev_f0->link[j].link = j;
-                                       dev_f0->link[j].dev = dev_f0;
+                               for(local_j=0;local_j<3;local_j++) {
+                                       dev_f0->link[local_j].link = local_j;
+                                       dev_f0->link[local_j].dev = dev_f0;
                                }
                        }
 
                }
 
                e0_later_single_core = 0;
-               if (dev && dev->enabled) {
-                       j = pci_read_config32(dev, 0xe8);
+               if (cpu_dev && cpu_dev->enabled) {
+                       j = pci_read_config32(cpu_dev, 0xe8);
                        j = (j >> 12) & 3; // dev is func 3
-                       printk_debug("  %s siblings=%d\n", dev_path(dev), j);
+                       printk_debug("  %s siblings=%d\n", dev_path(cpu_dev), j);
 
                        if(nb_cfg_54) {
                                // For e0 single core if nb_cfg_54 is set, apicid will be 0, 2, 4....
@@ -1308,7 +1308,7 @@ static unsigned int cpu_bus_scan(device_t dev, unsigned int max)
                        cpu = find_dev_path(cpu_bus, &cpu_path);
 
                        /* Enable the cpu if I have the processor */
-                       if (dev && dev->enabled) {
+                       if (cpu_dev && cpu_dev->enabled) {
                                if (!cpu) {
                                        cpu = alloc_dev(cpu_bus, &cpu_path);
                                }
@@ -1318,7 +1318,7 @@ static unsigned int cpu_bus_scan(device_t dev, unsigned int max)
                        }
 
                        /* Disable the cpu if I don't have the processor */
-                       if (cpu && (!dev || !dev->enabled)) {
+                       if (cpu && (!cpu_dev || !cpu_dev->enabled)) {
                                cpu->enabled = 0;
                        }
 

diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c
index ea706b8e0581d65d1fd8f563a3224930613da9ed..70c05f356037144025f71c2e2e1b27331259a2a6 100644 (file)
--- a/src/northbridge/amd/amdk8/raminit.c
+++ b/src/northbridge/amd/amdk8/raminit.c
@@ -805,7 +805,6 @@ static void set_dimm_map(const struct mem_controller *ctrl, struct dimm_size sz,
        };
 
        uint32_t map;
-       uint32_t dch;
 
        map = pci_read_config32(ctrl->f2, DRAM_BANK_ADDR_MAP);
        map &= ~(0xf << (index * 4));
@@ -1491,19 +1490,19 @@ static struct spd_set_memclk_result spd_set_memclk(const struct mem_controller *
 
                /* Loop through and find a fast clock with a low latency */
                for(index = 0; index < 3; index++, latency++) {
-                       int value;
+                       int spd_value;
                        if ((latency < 2) || (latency > 4) ||
                                (!(latencies & (1 << latency)))) {
                                continue;
                        }
-                       value = spd_read_byte(ctrl->channel0[i], latency_indicies[index]);
-                       if (value < 0) {
+                       spd_value = spd_read_byte(ctrl->channel0[i], latency_indicies[index]);
+                       if (spd_value < 0) {
                                goto hw_error;
                        }
 
                        /* Only increase the latency if we decreas the clock */
-                       if ((value >= min_cycle_time) && (value < new_cycle_time)) {
-                               new_cycle_time = value;
+                       if ((spd_value >= min_cycle_time) && (spd_value < new_cycle_time)) {
+                               new_cycle_time = spd_value;
                                new_latency = latency;
                        }
                }
@@ -1527,7 +1526,7 @@ static struct spd_set_memclk_result spd_set_memclk(const struct mem_controller *
                int latencies;
                int latency;
                int index;
-               int value;
+               int spd_value;
                if (!(dimm_mask & (1 << i))) {
                        continue;
                }
@@ -1554,13 +1553,13 @@ static struct spd_set_memclk_result spd_set_memclk(const struct mem_controller *
                }
 
                /* Read the min_cycle_time for this latency */
-               value = spd_read_byte(ctrl->channel0[i], latency_indicies[index]);
-               if (value < 0) goto hw_error;
+               spd_value = spd_read_byte(ctrl->channel0[i], latency_indicies[index]);
+               if (spd_value < 0) goto hw_error;
 
                /* All is good if the selected clock speed
                 * is what I need or slower.
                 */
-               if (value <= min_cycle_time) {
+               if (spd_value <= min_cycle_time) {
                        continue;
                }
                /* Otherwise I have an error, disable the dimm */

diff --git a/src/pc80/keyboard.c b/src/pc80/keyboard.c
index 4009a4502db53b6f442205c66167f826262d96c4..325e2eabca45d7e4be009d8a596d7a7aa5d30614 100644 (file)
--- a/src/pc80/keyboard.c
+++ b/src/pc80/keyboard.c
@@ -112,11 +112,11 @@ static void pc_keyboard_init(struct pc_keyboard *keyboard)
                outb(0x60, 0x64);
                if (!kbc_input_buffer_empty()) return;
                outb(0x20, 0x60);       /* send cmd: enable keyboard and IRQ 1 */
-               u8 resend = 10;
+               u8 broken_resend = 10;
                if ((inb(0x64) & 0x01)) {
                        regval = inb(0x60);
                }
-               --resend;
+               --broken_resend;
        } while (regval == 0xFE && resend > 0);
 
        /* clean up any junk that might have been in the keyboard */

diff --git a/src/southbridge/nvidia/ck804/ck804_lpc.c b/src/southbridge/nvidia/ck804/ck804_lpc.c
index 1d3f6cabb58e0b4675ce40752319a52fe982b744..db7c29ba8421fcb994ee04ebbc02a01113dc2502 100644 (file)
--- a/src/southbridge/nvidia/ck804/ck804_lpc.c
+++ b/src/southbridge/nvidia/ck804/ck804_lpc.c
@@ -171,7 +171,7 @@ static void enable_hpet(struct device *dev)
 
        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);
 }
 
 unsigned pm_base=0;
@@ -184,7 +184,7 @@ static void lpc_init(device_t dev)
        lpc_common_init(dev);
 
        pm_base = pci_read_config32(dev, 0x60) & 0xff00;
-       printk_info("%s: pm_base = %lx \n", __func__, pm_base);
+       printk_info("%s: pm_base = %x \n", __func__, pm_base);
 
 #if CK804_CHIP_REV==1
        if (dev->bus->secondary != 1)

diff --git a/src/southbridge/nvidia/ck804/ck804_nic.c b/src/southbridge/nvidia/ck804/ck804_nic.c
index 82de370acc0562e5627f9c87e8ab7a80295b6bc5..4ad0d11a62725855e5c8bd98917b7e0bc9820598 100644 (file)
--- a/src/southbridge/nvidia/ck804/ck804_nic.c
+++ b/src/southbridge/nvidia/ck804/ck804_nic.c
@@ -22,7 +22,7 @@ static void nic_init(struct device *dev)
        struct resource *res;
 
        res = find_resource(dev, 0x10);
-       base = res->base;
+       base = (uint8_t*)(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 = readl(mac_pos) + nic_index;
-               mac_h = readl(mac_pos + 4);
+               mac_l = readl((uint8_t*)mac_pos) + nic_index;
+               mac_h = readl((uint8_t*)mac_pos + 4);
        }
 #if 1
        /* Set that into NIC MMIO. */

diff --git a/src/southbridge/nvidia/ck804/ck804_sata.c b/src/southbridge/nvidia/ck804/ck804_sata.c
index 7bbf900a456eaab267bf5f4f2f28afdac76dcfb7..e9218abf3a2e6cf9c3c644a1e2216a7ddc794ec1 100644 (file)
--- a/src/southbridge/nvidia/ck804/ck804_sata.c
+++ b/src/southbridge/nvidia/ck804/ck804_sata.c
@@ -11,6 +11,10 @@
 #include <device/pci_ops.h>
 #include "ck804.h"
 
+#ifndef CK804_SATA_RESET_FOR_ATAPI
+#define CK804_SATA_RESET_FOR_ATAPI 0
+#endif
+
 #if CK804_SATA_RESET_FOR_ATAPI
 static void sata_com_reset(struct device *dev, unsigned reset)
 // reset = 1 : reset

diff --git a/util/cbfstool/cbfstool.h b/util/cbfstool/cbfstool.h
index f90b5670d026b3c561ea59f8152381a3e4e3a7f5..289b4812abc6471999c98a55d66086f3697b152f 100644 (file)
--- a/util/cbfstool/cbfstool.h
+++ b/util/cbfstool/cbfstool.h
@@ -58,7 +58,7 @@ struct rom {
 /* util.c */
 int open_rom(struct rom *rom, const char *filename);
 int create_rom(struct rom *rom, const unsigned char *filename, int size,
-              const unsigned char *bootblockname, int bootblocksize,
+              const char *bootblockname, int bootblocksize,
               int align);
 int size_and_open(const char *filename, unsigned int *size);
 int copy_from_fd(int fd, void *ptr, int size);

diff --git a/util/cbfstool/util.c b/util/cbfstool/util.c
index 5dd946b5d7915efd595e7e230ec8c4c53c33daae..8f2a65bd0caa8ee87d4a8e928da893c8c8a8b86e 100644 (file)
--- a/util/cbfstool/util.c
+++ b/util/cbfstool/util.c
@@ -168,7 +168,7 @@ err:
 }
 
 int create_rom(struct rom *rom, const unsigned char *filename,
-              int romsize, const unsigned char *bootblockname,
+              int romsize, const char *bootblockname,
               int bootblocksize, int align)
 {
        unsigned char null = '\0';
@@ -226,7 +226,6 @@ int add_bootblock(struct rom *rom, const char *filename)
        unsigned int size;
        int fd = size_and_open(filename, &size);
        int ret;
-       struct cbfs_header tmp;
 
        if (fd == -1)
                return -1;

diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c
index cca1b7c464f7febcba73a7d2d85879e3953c37f8..f86090aeb49429e775dd4f48c1ccdcfdf105b39c 100644 (file)
--- a/util/options/build_opt_tbl.c
+++ b/util/options/build_opt_tbl.c
@@ -487,6 +487,7 @@ int main(int argc, char **argv)
 
        /* See if we want to output a C source file */
        if(option) {
+               int err=0;
                strncpy(tmpfilename, dirname(option), TMPFILE_LEN);
                strncat(tmpfilename, TMPFILE_TEMPLATE, TMPFILE_LEN);
                tmpfile = mkstemp(tmpfilename);
@@ -510,13 +511,13 @@ int main(int argc, char **argv)
                }
                /* write the array values */
                for(i=0;i<(ct->size-1);i++) {
-                       if(!(i%10)) fwrite("\n\t",1,2,fp);
+                       if(!(i%10) && !err) err=fwrite("\n\t",1,2,fp);
                        sprintf(buf,"0x%02x,",cmos_table[i]);
-                       fwrite(buf,1,5,fp);
+                       if(!err) err=fwrite(buf,1,5,fp);
                }
                /* write the end */
                sprintf(buf,"0x%02x\n",cmos_table[i]);
-               fwrite(buf,1,4,fp);
+               if(!err) err=fwrite(buf,1,4,fp);
                if(!fwrite("};\n",1,3,fp)) {
                        perror("Error - Could not write image file");
                        fclose(fp);