diff options
| -rw-r--r-- | arch/ppc/boot/common/misc-common.c | 1 | ||||
| -rw-r--r-- | arch/ppc/boot/include/nonstdio.h | 3 | ||||
| -rw-r--r-- | arch/ppc/boot/openfirmware/chrpmain.c | 3 | ||||
| -rw-r--r-- | arch/ppc/boot/openfirmware/coffmain.c | 3 | ||||
| -rw-r--r-- | arch/ppc/boot/openfirmware/common.c | 1 | ||||
| -rw-r--r-- | arch/ppc/boot/openfirmware/newworldmain.c | 3 |
6 files changed, 8 insertions, 6 deletions
diff --git a/arch/ppc/boot/common/misc-common.c b/arch/ppc/boot/common/misc-common.c index 56d09ffa4612..2ad0fba5c07e 100644 --- a/arch/ppc/boot/common/misc-common.c +++ b/arch/ppc/boot/common/misc-common.c @@ -33,6 +33,7 @@ #include <stdarg.h> /* for va_ bits */ #include <linux/config.h> +#include <linux/string.h> #include "zlib.h" #include "nonstdio.h" diff --git a/arch/ppc/boot/include/nonstdio.h b/arch/ppc/boot/include/nonstdio.h index a926e624d92c..7a0f027f9ee1 100644 --- a/arch/ppc/boot/include/nonstdio.h +++ b/arch/ppc/boot/include/nonstdio.h @@ -21,12 +21,9 @@ extern FILE *stdin, *stdout; extern int getc(void); extern int printf(const char *format, ...); -extern int strlen(const char *s); extern int sprintf(char *str, const char *format, ...); extern int tstc(void); extern void exit(void); -extern void *memcpy(void *dest, const void *src, int n); -extern void *memmove(void *dest, const void *src, int n); extern void outb(int port, unsigned char val); extern void putc(const char c); extern void puthex(unsigned long val); diff --git a/arch/ppc/boot/openfirmware/chrpmain.c b/arch/ppc/boot/openfirmware/chrpmain.c index 30da57e915d3..ad8a457b99cd 100644 --- a/arch/ppc/boot/openfirmware/chrpmain.c +++ b/arch/ppc/boot/openfirmware/chrpmain.c @@ -6,6 +6,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include <linux/string.h> #include "nonstdio.h" #include "of1275.h" #include <asm/processor.h> @@ -34,7 +35,7 @@ char *avail_high; #define RAM_FREE ((unsigned long)(_end+0x1000)&~0xFFF) #define PROG_START 0x00010000 -#define PROG_SIZE 0x00400000 /* 4MB */ +#define PROG_SIZE 0x007f0000 /* 8MB */ #define SCRATCH_SIZE (128 << 10) diff --git a/arch/ppc/boot/openfirmware/coffmain.c b/arch/ppc/boot/openfirmware/coffmain.c index 3aff9feaaae0..c5985ba8e470 100644 --- a/arch/ppc/boot/openfirmware/coffmain.c +++ b/arch/ppc/boot/openfirmware/coffmain.c @@ -6,6 +6,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include <linux/string.h> #include <asm/processor.h> #include <asm/page.h> @@ -35,7 +36,7 @@ char *avail_high; #define RAM_END (RAM_START + 0x800000) /* only 8M mapped with BATs */ #define PROG_START RAM_START -#define PROG_SIZE 0x00400000 +#define PROG_SIZE 0x00700000 #define SCRATCH_SIZE (128 << 10) diff --git a/arch/ppc/boot/openfirmware/common.c b/arch/ppc/boot/openfirmware/common.c index b1e593521654..71195067c0d6 100644 --- a/arch/ppc/boot/openfirmware/common.c +++ b/arch/ppc/boot/openfirmware/common.c @@ -10,6 +10,7 @@ #include "zlib.h" #include "nonstdio.h" #include "of1275.h" +#include <linux/string.h> #include <asm/bootinfo.h> #include <asm/page.h> diff --git a/arch/ppc/boot/openfirmware/newworldmain.c b/arch/ppc/boot/openfirmware/newworldmain.c index 1fed5604eec5..6cd200395a6a 100644 --- a/arch/ppc/boot/openfirmware/newworldmain.c +++ b/arch/ppc/boot/openfirmware/newworldmain.c @@ -6,6 +6,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include <linux/string.h> #include "nonstdio.h" #include "of1275.h" #include <asm/processor.h> @@ -30,7 +31,7 @@ char *avail_high; #define RAM_END (16 << 20) #define PROG_START 0x00010000 -#define PROG_SIZE 0x003f0000 +#define PROG_SIZE 0x007f0000 #define SCRATCH_SIZE (128 << 10) |