On Tue, Jul 20, 2010 at 11:43:01PM -0500, Matthew McClintock wrote: > Use current command line if none given, specifically useful for > when arguments are added causing the use of the current cmdline > to not occur > > We also try to load the dtb above the kernel, this is useful for > relocatable kernels where they device tree needs to reside just > above the kernel base address > > Set the kernel entry address in the relocatable purgatory code > so we jump to the correct start address if not the default. Useful > for relocatable kernels > > Signed-off-by: Matthew McClintock <msm at freescale.com> > --- > kexec/arch/ppc/kexec-elf-ppc.c | 26 ++++++++++++++------------ > 1 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c > index ab2d343..87e6507 100644 > --- a/kexec/arch/ppc/kexec-elf-ppc.c > +++ b/kexec/arch/ppc/kexec-elf-ppc.c > @@ -182,6 +182,7 @@ int elf_ppc_load(int argc, char **argv, const char *buf, off_t len, > int target_is_gamecube = 0; > unsigned int addr; > unsigned long dtb_addr; > + unsigned long kernel_addr; > #endif > #define FIXUP_ENTRYS (20) > char *fixup_nodes[FIXUP_ENTRYS + 1]; I moved kernel_addr to outside the #ifdef GAME_CUBE
