git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
simple
/
misc-embedded.c
diff --git
a/arch/ppc/boot/simple/misc-embedded.c
b/arch/ppc/boot/simple/misc-embedded.c
index
58e2a92
..
8615d5f
100644
(file)
--- a/
arch/ppc/boot/simple/misc-embedded.c
+++ b/
arch/ppc/boot/simple/misc-embedded.c
@@
-22,7
+22,6
@@
#endif
#include "nonstdio.h"
#endif
#include "nonstdio.h"
-#include "zlib.h"
/* The linker tells us where the image is. */
extern char __image_begin, __image_end;
/* The linker tells us where the image is. */
extern char __image_begin, __image_end;
@@
-72,6
+71,14
@@
extern void flush_instruction_cache(void);
extern void gunzip(void *, int, unsigned char *, int *);
extern void embed_config(bd_t **bp);
extern void gunzip(void *, int, unsigned char *, int *);
extern void embed_config(bd_t **bp);
+/* Weak function for boards which don't need to build the
+ * board info struct because they are using PPCBoot/U-Boot.
+ */
+void __attribute__ ((weak))
+embed_config(bd_t **bdp)
+{
+}
+
unsigned long
load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *bp)
{
unsigned long
load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *bp)
{