(trivial) fix some warnings

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4076 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index 032a0f3264c1aa1b816da0518e353118254c0430..aa665c25205042adb5527ef899aa014f12204980 100644 (file)
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -204,7 +204,7 @@ struct lb_forward *lb_forward(struct lb_header *header, struct lb_header *next_h
        forward = (struct lb_forward *)rec;
        forward->tag = LB_TAG_FORWARD;
        forward->size = sizeof(*forward);
-       forward->forward = (uint64_t) next_header;
+       forward->forward = (uint64_t)(unsigned long)next_header;
        return forward;
 }
 

diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 72f23449114d3a0e179a00d7f7d8544743de0d73..b9c1f3f7ef5f48ca1ac61aaa4aff346be99b798a 100644 (file)
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -64,8 +64,11 @@ uint64_t high_tables_size;
 
 struct lb_memory *write_tables(void)
 {
-       unsigned long low_table_start, low_table_end, new_low_table_end;
+       unsigned long low_table_start, low_table_end;
        unsigned long rom_table_start, rom_table_end;
+#if HAVE_MP_TABLE == 1
+       unsigned long new_low_table_end;
+#endif
 
 #if HAVE_HIGH_TABLES == 1
        /* Even if high tables are configured, all tables are copied both to the

diff --git a/src/arch/i386/lib/exception.c b/src/arch/i386/lib/exception.c
index a3306520b40608802aea6d0b22d974f2b71545e1..ddf37a65ebdc2cfe674f81a6f7fe9cf6d97c7f59 100644 (file)
--- a/src/arch/i386/lib/exception.c
+++ b/src/arch/i386/lib/exception.c
@@ -1,7 +1,7 @@
 #include <console/console.h>
 #include <string.h>
 
-#if CONFIG_GDB_STUB == 1
+#if defined(CONFIG_GDB_STUB) && CONFIG_GDB_STUB == 1
 
 /* BUFMAX defines the maximum number of characters in inbound/outbound buffers.
  * At least NUM_REGBYTES*2 are needed for register packets 

diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h
index 66b40fc7b6c69f6f5b72dfcf42a5f3462e55325d..8fced2974b664d36e92f8081b4533e66b4f11b9f 100644 (file)
--- a/src/include/cpu/x86/lapic.h
+++ b/src/include/cpu/x86/lapic.h
@@ -8,6 +8,8 @@
 /* See if I need to initialize the local apic */
 #if CONFIG_SMP || CONFIG_IOAPIC
 #  define NEED_LAPIC 1
+#else
+#  define NEED_LAPIC 0
 #endif
 
 static inline __attribute__((always_inline)) unsigned long lapic_read(unsigned long reg)

diff --git a/src/southbridge/intel/i82371eb/i82371eb_ide.c b/src/southbridge/intel/i82371eb/i82371eb_ide.c
index 0e91839fb2ac444d6479ee2b3062942420c09016..6611289403c68d0fb68d21b90e97f23ac060f83b 100644 (file)
--- a/src/southbridge/intel/i82371eb/i82371eb_ide.c
+++ b/src/southbridge/intel/i82371eb/i82371eb_ide.c
@@ -144,7 +144,7 @@ static void ide_init_i82371ab_eb_mb(struct device *dev)
 }
 
 /* Intel 82371FB/SB */
-static const struct device_operations ide_ops_fb_sb = {
+static struct device_operations ide_ops_fb_sb = {
        .read_resources         = pci_dev_read_resources,
        .set_resources          = pci_dev_set_resources,
        .enable_resources       = pci_dev_enable_resources,
@@ -155,7 +155,7 @@ static const struct device_operations ide_ops_fb_sb = {
 };
 
 /* Intel 82371AB/EB/MB */
-static const struct device_operations ide_ops_ab_eb_mb = {
+static struct device_operations ide_ops_ab_eb_mb = {
        .read_resources         = pci_dev_read_resources,
        .set_resources          = pci_dev_set_resources,
        .enable_resources       = pci_dev_enable_resources,