[v2] r4076 - in trunk/coreboot-v2/src: arch/i386/boot arch/i386/lib include/cpu/x86 southbridge/intel/i82371eb

Author: stepan
Date: 2009-04-06 16:00:53 +0200 (Mon, 06 Apr 2009)
New Revision: 4076

Modified:
   trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c
   trunk/coreboot-v2/src/arch/i386/boot/tables.c
   trunk/coreboot-v2/src/arch/i386/lib/exception.c
   trunk/coreboot-v2/src/include/cpu/x86/lapic.h
   trunk/coreboot-v2/src/southbridge/intel/i82371eb/i82371eb_ide.c
Log:
(trivial) fix some warnings

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c	2009-04-06 13:38:54 UTC (rev 4075)
+++ trunk/coreboot-v2/src/arch/i386/boot/coreboot_table.c	2009-04-06 14:00:53 UTC (rev 4076)
@@ -204,7 +204,7 @@
    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;
 }

Modified: trunk/coreboot-v2/src/arch/i386/boot/tables.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-04-06 13:38:54 UTC (rev 4075)
+++ trunk/coreboot-v2/src/arch/i386/boot/tables.c	2009-04-06 14:00:53 UTC (rev 4076)
@@ -64,8 +64,11 @@

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

Modified: trunk/coreboot-v2/src/arch/i386/lib/exception.c
===================================================================
--- trunk/coreboot-v2/src/arch/i386/lib/exception.c	2009-04-06 13:38:54 UTC (rev 4075)
+++ trunk/coreboot-v2/src/arch/i386/lib/exception.c	2009-04-06 14:00:53 UTC (rev 4076)
@@ -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

Modified: trunk/coreboot-v2/src/include/cpu/x86/lapic.h
===================================================================
--- trunk/coreboot-v2/src/include/cpu/x86/lapic.h	2009-04-06 13:38:54 UTC (rev 4075)
+++ trunk/coreboot-v2/src/include/cpu/x86/lapic.h	2009-04-06 14:00:53 UTC (rev 4076)
@@ -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)

Modified: trunk/coreboot-v2/src/southbridge/intel/i82371eb/i82371eb_ide.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/intel/i82371eb/i82371eb_ide.c	2009-04-06 13:38:54 UTC (rev 4075)
+++ trunk/coreboot-v2/src/southbridge/intel/i82371eb/i82371eb_ide.c	2009-04-06 14:00:53 UTC (rev 4076)
@@ -144,7 +144,7 @@
 }

/* 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 @@
 };

/* 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,