summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2009-04-06 14:00:53 +0000
committerStefan Reinauer <stepan@openbios.org>2009-04-06 14:00:53 +0000
commitdf77f345e734e3a16548126ed0542615b6144ab6 (patch)
tree60e309e8584c1842f4cc42cacad9fe4173c4c6a8 /src
parentda6d92ba11ced79f0e4c6c409d37d6e36d73fd91 (diff)
downloadcoreboot-df77f345e734e3a16548126ed0542615b6144ab6.tar.xz
(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
Diffstat (limited to 'src')
-rw-r--r--src/arch/i386/boot/coreboot_table.c2
-rw-r--r--src/arch/i386/boot/tables.c5
-rw-r--r--src/arch/i386/lib/exception.c2
-rw-r--r--src/include/cpu/x86/lapic.h2
-rw-r--r--src/southbridge/intel/i82371eb/i82371eb_ide.c4
5 files changed, 10 insertions, 5 deletions
diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index 032a0f3264..aa665c2520 100644
--- 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 72f2344911..b9c1f3f7ef 100644
--- 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 a3306520b4..ddf37a65eb 100644
--- 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 66b40fc7b6..8fced2974b 100644
--- 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 0e91839fb2..6611289403 100644
--- 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,