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>

7 files changed, 8 insertions, 4 deletions

diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c
index 8441903e7c..e3c944d443 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 48d6ef5495..378c6f387f 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 82736b14fe..fa0c576dc9 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 256bfc25f7..59768dbd66 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;
 
diff --git a/payloads/libpayload/arch/powerpc/coreboot.c b/payloads/libpayload/arch/powerpc/coreboot.c
index 95d8f16f76..ee1842c82f 100644
--- a/payloads/libpayload/arch/powerpc/coreboot.c
+++ b/payloads/libpayload/arch/powerpc/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/powerpc/main.c b/payloads/libpayload/arch/powerpc/main.c
index 48d6ef5495..378c6f387f 100644
--- a/payloads/libpayload/arch/powerpc/main.c
+++ b/payloads/libpayload/arch/powerpc/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/powerpc/virtual.c b/payloads/libpayload/arch/powerpc/virtual.c
index 6312ae13ca..6ff588c504 100644
--- a/payloads/libpayload/arch/powerpc/virtual.c
+++ b/payloads/libpayload/arch/powerpc/virtual.c
@@ -27,6 +27,7 @@
  * SUCH DAMAGE.
  */
 
+#include <unistd.h>
 
 unsigned long virtual_offset = 0;