diff options
author | Patrick Georgi <patrick@georgi-clan.de> | 2011-04-21 18:57:16 +0200 |
---|---|---|
committer | Uwe Hermann <uwe@hermann-uwe.de> | 2011-06-30 20:41:23 +0200 |
commit | 7f96583f0f6b9829f73fb8afbb6f367323446030 (patch) | |
tree | 4c26b124a3c077cf1419f143bf29e89ea2d528e2 /payloads/libpayload/arch/i386 | |
parent | b3db79e9965cb290615a02b324648bc64f805660 (diff) | |
download | coreboot-staging-7f96583f0f6b9829f73fb8afbb6f367323446030.zip coreboot-staging-7f96583f0f6b9829f73fb8afbb6f367323446030.tar.gz |
Reduce warnings/errors in libpayload when using picky compiler options
The new build system uses quite a few more -W flags for the compiler by
default than the old one. And that's for the better.
Change-Id: Ia8e3d28fb35c56760c2bd0983046c7067e8c5dd6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/72
Tested-by: build bot (Jenkins)
Reviewed-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'payloads/libpayload/arch/i386')
-rw-r--r-- | payloads/libpayload/arch/i386/coreboot.c | 2 | ||||
-rw-r--r-- | payloads/libpayload/arch/i386/main.c | 1 | ||||
-rw-r--r-- | payloads/libpayload/arch/i386/multiboot.c | 4 | ||||
-rw-r--r-- | payloads/libpayload/arch/i386/virtual.c | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c index 8441903..e3c944d 100644 --- a/payloads/libpayload/arch/i386/coreboot.c +++ b/payloads/libpayload/arch/i386/coreboot.c @@ -57,7 +57,7 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info) struct cb_memory_range *range = (struct cb_memory_range *)MEM_RANGE_PTR(mem, i); -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY if (range->type != CB_MEM_RAM) continue; #endif diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c index 48d6ef5..378c6f3 100644 --- a/payloads/libpayload/arch/i386/main.c +++ b/payloads/libpayload/arch/i386/main.c @@ -41,6 +41,7 @@ char *main_argv[MAX_ARGC_COUNT]; * This is our C entry function - set up the system * and jump into the payload entry point. */ +void start_main(void); void start_main(void) { extern int main(int argc, char **argv); diff --git a/payloads/libpayload/arch/i386/multiboot.c b/payloads/libpayload/arch/i386/multiboot.c index 82736b1..fa0c576 100644 --- a/payloads/libpayload/arch/i386/multiboot.c +++ b/payloads/libpayload/arch/i386/multiboot.c @@ -45,7 +45,7 @@ static void mb_parse_mmap(struct multiboot_header *table, while(ptr < (start + table->mmap_length)) { struct multiboot_mmap *mmap = (struct multiboot_mmap *) ptr; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY /* 1 == normal RAM. Ignore everything else for now */ if (mmap->type == 1) { @@ -56,7 +56,7 @@ static void mb_parse_mmap(struct multiboot_header *table, if (++info->n_memranges == SYSINFO_MAX_MEM_RANGES) return; -#if MEMMAP_RAM_ONLY +#ifdef CONFIG_MEMMAP_RAM_ONLY } #endif diff --git a/payloads/libpayload/arch/i386/virtual.c b/payloads/libpayload/arch/i386/virtual.c index 256bfc2..59768db 100644 --- a/payloads/libpayload/arch/i386/virtual.c +++ b/payloads/libpayload/arch/i386/virtual.c @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <unistd.h> unsigned long virtual_offset = 0; |