2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) Paul Mackerras 1997.
|
|
|
|
*
|
|
|
|
* Updates for PPC64 by Todd Inglett, Dave Engebretsen & Peter Bergner.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
2005-08-08 03:24:38 +00:00
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include "elf.h"
|
|
|
|
#include "page.h"
|
|
|
|
#include "string.h"
|
|
|
|
#include "stdio.h"
|
2006-09-19 04:05:08 +00:00
|
|
|
#include "ops.h"
|
2007-03-05 03:24:52 +00:00
|
|
|
#include "gunzip_util.h"
|
2006-09-19 04:05:08 +00:00
|
|
|
#include "flatdevtree.h"
|
2005-08-08 03:24:38 +00:00
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
extern char _start[];
|
2005-10-29 00:46:45 +00:00
|
|
|
extern char __bss_start[];
|
2005-09-06 22:50:02 +00:00
|
|
|
extern char _end[];
|
2005-04-16 22:20:36 +00:00
|
|
|
extern char _vmlinux_start[];
|
|
|
|
extern char _vmlinux_end[];
|
|
|
|
extern char _initrd_start[];
|
|
|
|
extern char _initrd_end[];
|
2006-10-16 20:49:27 +00:00
|
|
|
extern char _dtb_start[];
|
|
|
|
extern char _dtb_end[];
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
static struct gunzip_state gzstate;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
struct addr_range {
|
2007-03-05 03:24:52 +00:00
|
|
|
void *addr;
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long size;
|
|
|
|
};
|
2005-11-16 02:38:21 +00:00
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
struct elf_info {
|
|
|
|
unsigned long loadsize;
|
|
|
|
unsigned long memsize;
|
|
|
|
unsigned long elfoffset;
|
|
|
|
};
|
2005-10-29 00:46:38 +00:00
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
typedef void (*kernel_entry_t)(unsigned long, unsigned long, void *);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
#undef DEBUG
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
static int parse_elf64(void *hdr, struct elf_info *info)
|
2005-11-16 02:38:21 +00:00
|
|
|
{
|
|
|
|
Elf64_Ehdr *elf64 = hdr;
|
|
|
|
Elf64_Phdr *elf64ph;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (!(elf64->e_ident[EI_MAG0] == ELFMAG0 &&
|
|
|
|
elf64->e_ident[EI_MAG1] == ELFMAG1 &&
|
|
|
|
elf64->e_ident[EI_MAG2] == ELFMAG2 &&
|
|
|
|
elf64->e_ident[EI_MAG3] == ELFMAG3 &&
|
|
|
|
elf64->e_ident[EI_CLASS] == ELFCLASS64 &&
|
|
|
|
elf64->e_ident[EI_DATA] == ELFDATA2MSB &&
|
|
|
|
elf64->e_type == ET_EXEC &&
|
|
|
|
elf64->e_machine == EM_PPC64))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
elf64ph = (Elf64_Phdr *)((unsigned long)elf64 +
|
|
|
|
(unsigned long)elf64->e_phoff);
|
|
|
|
for (i = 0; i < (unsigned int)elf64->e_phnum; i++, elf64ph++)
|
2006-01-30 13:28:03 +00:00
|
|
|
if (elf64ph->p_type == PT_LOAD)
|
2005-11-16 02:38:21 +00:00
|
|
|
break;
|
|
|
|
if (i >= (unsigned int)elf64->e_phnum)
|
|
|
|
return 0;
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
info->loadsize = (unsigned long)elf64ph->p_filesz;
|
|
|
|
info->memsize = (unsigned long)elf64ph->p_memsz;
|
|
|
|
info->elfoffset = (unsigned long)elf64ph->p_offset;
|
2006-01-14 04:04:06 +00:00
|
|
|
|
2005-11-16 02:38:21 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
static int parse_elf32(void *hdr, struct elf_info *info)
|
2005-11-16 02:38:21 +00:00
|
|
|
{
|
|
|
|
Elf32_Ehdr *elf32 = hdr;
|
|
|
|
Elf32_Phdr *elf32ph;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
if (!(elf32->e_ident[EI_MAG0] == ELFMAG0 &&
|
|
|
|
elf32->e_ident[EI_MAG1] == ELFMAG1 &&
|
|
|
|
elf32->e_ident[EI_MAG2] == ELFMAG2 &&
|
|
|
|
elf32->e_ident[EI_MAG3] == ELFMAG3 &&
|
|
|
|
elf32->e_ident[EI_CLASS] == ELFCLASS32 &&
|
|
|
|
elf32->e_ident[EI_DATA] == ELFDATA2MSB &&
|
|
|
|
elf32->e_type == ET_EXEC &&
|
|
|
|
elf32->e_machine == EM_PPC))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
elf32ph = (Elf32_Phdr *) ((unsigned long)elf32 + elf32->e_phoff);
|
|
|
|
for (i = 0; i < elf32->e_phnum; i++, elf32ph++)
|
2006-01-30 13:28:03 +00:00
|
|
|
if (elf32ph->p_type == PT_LOAD)
|
2005-11-16 02:38:21 +00:00
|
|
|
break;
|
|
|
|
if (i >= elf32->e_phnum)
|
|
|
|
return 0;
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
info->loadsize = elf32ph->p_filesz;
|
|
|
|
info->memsize = elf32ph->p_memsz;
|
|
|
|
info->elfoffset = elf32ph->p_offset;
|
2005-11-16 02:38:21 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
static struct addr_range prep_kernel(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2007-03-05 03:24:52 +00:00
|
|
|
char elfheader[256];
|
|
|
|
void *vmlinuz_addr = _vmlinux_start;
|
|
|
|
unsigned long vmlinuz_size = _vmlinux_end - _vmlinux_start;
|
|
|
|
void *addr = 0;
|
|
|
|
struct elf_info ei;
|
2005-10-29 00:46:40 +00:00
|
|
|
int len;
|
2006-01-14 04:04:06 +00:00
|
|
|
|
2005-11-16 02:38:21 +00:00
|
|
|
/* gunzip the ELF header of the kernel */
|
2007-03-05 03:24:52 +00:00
|
|
|
gunzip_start(&gzstate, vmlinuz_addr, vmlinuz_size);
|
2007-03-05 03:24:52 +00:00
|
|
|
gunzip_exactly(&gzstate, elfheader, sizeof(elfheader));
|
2005-11-16 02:38:21 +00:00
|
|
|
|
2007-03-21 15:02:44 +00:00
|
|
|
if (!parse_elf64(elfheader, &ei) && !parse_elf32(elfheader, &ei))
|
|
|
|
fatal("Error: not a valid PPC32 or PPC64 ELF file!\n\r");
|
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
if (platform_ops.image_hdr)
|
|
|
|
platform_ops.image_hdr(elfheader);
|
2005-11-16 02:38:21 +00:00
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
/* We need to alloc the memsize: gzip will expand the kernel
|
|
|
|
* text/data, then possible rubbish we don't care about. But
|
|
|
|
* the kernel bss must be claimed (it will be zero'd by the
|
|
|
|
* kernel itself)
|
2005-11-07 08:57:58 +00:00
|
|
|
*/
|
2007-03-05 03:24:52 +00:00
|
|
|
printf("Allocating 0x%lx bytes for kernel ...\n\r", ei.memsize);
|
|
|
|
|
|
|
|
if (platform_ops.vmlinux_alloc) {
|
|
|
|
addr = platform_ops.vmlinux_alloc(ei.memsize);
|
|
|
|
} else {
|
2007-03-21 15:02:44 +00:00
|
|
|
if ((unsigned long)_start < ei.memsize)
|
|
|
|
fatal("Insufficient memory for kernel at address 0!"
|
2007-03-22 05:59:13 +00:00
|
|
|
" (_start=%p)\n\r", _start);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
/* Finally, gunzip the kernel */
|
|
|
|
printf("gunzipping (0x%p <- 0x%p:0x%p)...", addr,
|
|
|
|
vmlinuz_addr, vmlinuz_addr+vmlinuz_size);
|
|
|
|
/* discard up to the actual load data */
|
|
|
|
gunzip_discard(&gzstate, ei.elfoffset - sizeof(elfheader));
|
|
|
|
len = gunzip_finish(&gzstate, addr, ei.memsize);
|
2007-03-22 05:59:13 +00:00
|
|
|
printf("done 0x%x bytes\n\r", len);
|
2007-03-05 03:24:52 +00:00
|
|
|
|
|
|
|
flush_cache(addr, ei.loadsize);
|
|
|
|
|
|
|
|
return (struct addr_range){addr, ei.memsize};
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct addr_range prep_initrd(struct addr_range vmlinux,
|
|
|
|
unsigned long initrd_addr,
|
|
|
|
unsigned long initrd_size)
|
|
|
|
{
|
|
|
|
void *devp;
|
|
|
|
u32 initrd_start, initrd_end;
|
|
|
|
|
|
|
|
/* If we have an image attached to us, it overrides anything
|
|
|
|
* supplied by the loader. */
|
|
|
|
if (_initrd_end > _initrd_start) {
|
|
|
|
printf("Attached initrd image at 0x%p-0x%p\n\r",
|
|
|
|
_initrd_start, _initrd_end);
|
|
|
|
initrd_addr = (unsigned long)_initrd_start;
|
|
|
|
initrd_size = _initrd_end - _initrd_start;
|
|
|
|
} else if (initrd_size > 0) {
|
|
|
|
printf("Using loader supplied ramdisk at 0x%lx-0x%lx\n\r",
|
|
|
|
initrd_addr, initrd_addr + initrd_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there's no initrd at all, we're done */
|
|
|
|
if (! initrd_size)
|
|
|
|
return (struct addr_range){0, 0};
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/*
|
2007-03-05 03:24:52 +00:00
|
|
|
* If the initrd is too low it will be clobbered when the
|
|
|
|
* kernel relocates to its final location. In this case,
|
|
|
|
* allocate a safer place and move it.
|
2005-04-16 22:20:36 +00:00
|
|
|
*/
|
2007-03-05 03:24:52 +00:00
|
|
|
if (initrd_addr < vmlinux.size) {
|
|
|
|
void *old_addr = (void *)initrd_addr;
|
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
printf("Allocating 0x%lx bytes for initrd ...\n\r",
|
2007-03-05 03:24:52 +00:00
|
|
|
initrd_size);
|
|
|
|
initrd_addr = (unsigned long)malloc(initrd_size);
|
2007-03-21 15:02:44 +00:00
|
|
|
if (! initrd_addr)
|
|
|
|
fatal("Can't allocate memory for initial "
|
2007-03-05 03:24:52 +00:00
|
|
|
"ramdisk !\n\r");
|
2007-03-22 05:59:13 +00:00
|
|
|
printf("Relocating initrd 0x%lx <- 0x%p (0x%lx bytes)\n\r",
|
2007-03-05 03:24:52 +00:00
|
|
|
initrd_addr, old_addr, initrd_size);
|
|
|
|
memmove((void *)initrd_addr, old_addr, initrd_size);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
printf("initrd head: 0x%lx\n\r", *((unsigned long *)initrd_addr));
|
|
|
|
|
|
|
|
/* Tell the kernel initrd address via device tree */
|
|
|
|
devp = finddevice("/chosen");
|
2007-03-21 15:02:44 +00:00
|
|
|
if (! devp)
|
|
|
|
fatal("Device tree has no chosen node!\n\r");
|
2007-03-05 03:24:52 +00:00
|
|
|
|
|
|
|
initrd_start = (u32)initrd_addr;
|
|
|
|
initrd_end = (u32)initrd_addr + initrd_size;
|
|
|
|
|
|
|
|
setprop(devp, "linux,initrd-start", &initrd_start,
|
|
|
|
sizeof(initrd_start));
|
|
|
|
setprop(devp, "linux,initrd-end", &initrd_end, sizeof(initrd_end));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
return (struct addr_range){(void *)initrd_addr, initrd_size};
|
2006-09-19 04:05:08 +00:00
|
|
|
}
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
/* A buffer that may be edited by tools operating on a zImage binary so as to
|
|
|
|
* edit the command line passed to vmlinux (by setting /chosen/bootargs).
|
|
|
|
* The buffer is put in it's own section so that tools may locate it easier.
|
|
|
|
*/
|
|
|
|
static char builtin_cmdline[COMMAND_LINE_SIZE]
|
|
|
|
__attribute__((__section__("__builtin_cmdline")));
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
static void get_cmdline(char *buf, int size)
|
|
|
|
{
|
|
|
|
void *devp;
|
|
|
|
int len = strlen(builtin_cmdline);
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
buf[0] = '\0';
|
|
|
|
|
|
|
|
if (len > 0) { /* builtin_cmdline overrides dt's /chosen/bootargs */
|
|
|
|
len = min(len, size-1);
|
|
|
|
strncpy(buf, builtin_cmdline, len);
|
|
|
|
buf[len] = '\0';
|
|
|
|
}
|
|
|
|
else if ((devp = finddevice("/chosen")))
|
|
|
|
getprop(devp, "bootargs", buf, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void set_cmdline(char *buf)
|
|
|
|
{
|
|
|
|
void *devp;
|
|
|
|
|
|
|
|
if ((devp = finddevice("/chosen")))
|
|
|
|
setprop(devp, "bootargs", buf, strlen(buf) + 1);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
struct platform_ops platform_ops;
|
|
|
|
struct dt_ops dt_ops;
|
|
|
|
struct console_ops console_ops;
|
[POWERPC] zImage: Cleanup and improve zImage entry point
This patch re-organises the way the zImage wrapper code is entered, to
allow more flexibility on platforms with unusual entry conditions.
After this patch, a platform .o file has two options:
1) It can define a _zimage_start, in which case the platform code gets
control from the very beginning of execution. In this case the
platform code is responsible for relocating the zImage if necessary,
clearing the BSS, performing any platform specific initialization, and
finally calling start() to load and enter the kernel.
2) It can define platform_init(). In this case the generic crt0.S
handles initial entry, and calls platform_init() before calling
start(). The signature of platform_init() is changed, however, to
take up to 5 parameters (in r3..r7) as they come from the platform's
initial loader, instead of a fixed set of parameters based on OF's
usage.
When using the generic crt0.S, the platform .o can optionally
supply a custom stack to use, using the BSS_STACK() macro. If this
is not supplied, the crt0.S will assume that the loader has
supplied a usable stack.
In either case, the platform code communicates information to the
generic code (specifically, a PROM pointer for OF systems, and/or an
initrd image address supplied by the bootloader) via a global
structure "loader_info".
In addition the wrapper script is rearranged to ensure that the
platform .o is always linked first. This means that platforms where
the zImage entry point is at a fixed address or offset, rather than
being encoded in the binary header can be supported using option (1).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-05 03:24:52 +00:00
|
|
|
struct loader_info loader_info;
|
2006-09-19 04:05:08 +00:00
|
|
|
|
[POWERPC] zImage: Cleanup and improve zImage entry point
This patch re-organises the way the zImage wrapper code is entered, to
allow more flexibility on platforms with unusual entry conditions.
After this patch, a platform .o file has two options:
1) It can define a _zimage_start, in which case the platform code gets
control from the very beginning of execution. In this case the
platform code is responsible for relocating the zImage if necessary,
clearing the BSS, performing any platform specific initialization, and
finally calling start() to load and enter the kernel.
2) It can define platform_init(). In this case the generic crt0.S
handles initial entry, and calls platform_init() before calling
start(). The signature of platform_init() is changed, however, to
take up to 5 parameters (in r3..r7) as they come from the platform's
initial loader, instead of a fixed set of parameters based on OF's
usage.
When using the generic crt0.S, the platform .o can optionally
supply a custom stack to use, using the BSS_STACK() macro. If this
is not supplied, the crt0.S will assume that the loader has
supplied a usable stack.
In either case, the platform code communicates information to the
generic code (specifically, a PROM pointer for OF systems, and/or an
initrd image address supplied by the bootloader) via a global
structure "loader_info".
In addition the wrapper script is rearranged to ensure that the
platform .o is always linked first. This means that platforms where
the zImage entry point is at a fixed address or offset, rather than
being encoded in the binary header can be supported using option (1).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-05 03:24:52 +00:00
|
|
|
void start(void *sp)
|
2006-09-19 04:05:08 +00:00
|
|
|
{
|
2007-03-05 03:24:52 +00:00
|
|
|
struct addr_range vmlinux, initrd;
|
2006-09-19 04:05:08 +00:00
|
|
|
kernel_entry_t kentry;
|
|
|
|
char cmdline[COMMAND_LINE_SIZE];
|
[POWERPC] Cleanup zImage handling of kernel entry with flat device tree
This makes 2 changes to clean up the flat device tree handling
logic in the zImage wrapper.
First, there were two callbacks from the dt_ops structure used for
producing a final flat tree to pass to the kerne: dt_ops.ft_pack()
which packed the flat tree (possibly a no-op) and dt_ops.ft_addr()
which retreived the address of the final blob. Since they were only
ever called together, this patch combines the two into a single new
callback, dt_ops.finalize(). This new callback does whatever
platform-dependent things are necessary to produce a final flat device
tree blob, and returns the blob's addres.
Second, the current logic calls the kernel with a flat device tree if
one is build into the zImage wrapper, otherwise it boots the kernel
with a PROM pointer, expecting the kernel to copy the OF device tree
itself. This approach precludes the possibility of the platform
wrapper code building a flat device tree from whatever
platform-specific information firmware provides. Thus, this patch
takes the more sensible approach of invoking the kernel with a flat
tree if the dt_ops.finalize callback provides one (by whatever means).
So, the dt_ops.finalize callback can be NULL, or can be a function
which returns NULL. In either case, the zImage wrapper logic assumes
that this is a platform with OF and invokes the kernel accordingly.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-21 00:37:37 +00:00
|
|
|
unsigned long ft_addr = 0;
|
2006-09-19 04:05:08 +00:00
|
|
|
|
|
|
|
if (console_ops.open && (console_ops.open() < 0))
|
|
|
|
exit();
|
|
|
|
if (platform_ops.fixups)
|
|
|
|
platform_ops.fixups();
|
|
|
|
|
|
|
|
printf("\n\rzImage starting: loaded at 0x%p (sp: 0x%p)\n\r",
|
|
|
|
_start, sp);
|
|
|
|
|
2007-03-05 03:24:52 +00:00
|
|
|
vmlinux = prep_kernel();
|
[POWERPC] zImage: Cleanup and improve zImage entry point
This patch re-organises the way the zImage wrapper code is entered, to
allow more flexibility on platforms with unusual entry conditions.
After this patch, a platform .o file has two options:
1) It can define a _zimage_start, in which case the platform code gets
control from the very beginning of execution. In this case the
platform code is responsible for relocating the zImage if necessary,
clearing the BSS, performing any platform specific initialization, and
finally calling start() to load and enter the kernel.
2) It can define platform_init(). In this case the generic crt0.S
handles initial entry, and calls platform_init() before calling
start(). The signature of platform_init() is changed, however, to
take up to 5 parameters (in r3..r7) as they come from the platform's
initial loader, instead of a fixed set of parameters based on OF's
usage.
When using the generic crt0.S, the platform .o can optionally
supply a custom stack to use, using the BSS_STACK() macro. If this
is not supplied, the crt0.S will assume that the loader has
supplied a usable stack.
In either case, the platform code communicates information to the
generic code (specifically, a PROM pointer for OF systems, and/or an
initrd image address supplied by the bootloader) via a global
structure "loader_info".
In addition the wrapper script is rearranged to ensure that the
platform .o is always linked first. This means that platforms where
the zImage entry point is at a fixed address or offset, rather than
being encoded in the binary header can be supported using option (1).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-05 03:24:52 +00:00
|
|
|
initrd = prep_initrd(vmlinux, loader_info.initrd_addr,
|
|
|
|
loader_info.initrd_size);
|
2006-09-19 04:05:08 +00:00
|
|
|
|
|
|
|
/* If cmdline came from zimage wrapper or if we can edit the one
|
|
|
|
* in the dt, print it out and edit it, if possible.
|
|
|
|
*/
|
|
|
|
if ((strlen(builtin_cmdline) > 0) || console_ops.edit_cmdline) {
|
|
|
|
get_cmdline(cmdline, COMMAND_LINE_SIZE);
|
|
|
|
printf("\n\rLinux/PowerPC load: %s", cmdline);
|
|
|
|
if (console_ops.edit_cmdline)
|
|
|
|
console_ops.edit_cmdline(cmdline, COMMAND_LINE_SIZE);
|
|
|
|
printf("\n\r");
|
|
|
|
set_cmdline(cmdline);
|
|
|
|
}
|
|
|
|
|
[POWERPC] Cleanup zImage handling of kernel entry with flat device tree
This makes 2 changes to clean up the flat device tree handling
logic in the zImage wrapper.
First, there were two callbacks from the dt_ops structure used for
producing a final flat tree to pass to the kerne: dt_ops.ft_pack()
which packed the flat tree (possibly a no-op) and dt_ops.ft_addr()
which retreived the address of the final blob. Since they were only
ever called together, this patch combines the two into a single new
callback, dt_ops.finalize(). This new callback does whatever
platform-dependent things are necessary to produce a final flat device
tree blob, and returns the blob's addres.
Second, the current logic calls the kernel with a flat device tree if
one is build into the zImage wrapper, otherwise it boots the kernel
with a PROM pointer, expecting the kernel to copy the OF device tree
itself. This approach precludes the possibility of the platform
wrapper code building a flat device tree from whatever
platform-specific information firmware provides. Thus, this patch
takes the more sensible approach of invoking the kernel with a flat
tree if the dt_ops.finalize callback provides one (by whatever means).
So, the dt_ops.finalize callback can be NULL, or can be a function
which returns NULL. In either case, the zImage wrapper logic assumes
that this is a platform with OF and invokes the kernel accordingly.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-21 00:37:37 +00:00
|
|
|
printf("Finalizing device tree...");
|
|
|
|
if (dt_ops.finalize)
|
|
|
|
ft_addr = dt_ops.finalize();
|
|
|
|
if (ft_addr)
|
|
|
|
printf(" flat tree at 0x%lx\n\r", ft_addr);
|
|
|
|
else
|
[POWERPC] zImage: Cleanup and improve zImage entry point
This patch re-organises the way the zImage wrapper code is entered, to
allow more flexibility on platforms with unusual entry conditions.
After this patch, a platform .o file has two options:
1) It can define a _zimage_start, in which case the platform code gets
control from the very beginning of execution. In this case the
platform code is responsible for relocating the zImage if necessary,
clearing the BSS, performing any platform specific initialization, and
finally calling start() to load and enter the kernel.
2) It can define platform_init(). In this case the generic crt0.S
handles initial entry, and calls platform_init() before calling
start(). The signature of platform_init() is changed, however, to
take up to 5 parameters (in r3..r7) as they come from the platform's
initial loader, instead of a fixed set of parameters based on OF's
usage.
When using the generic crt0.S, the platform .o can optionally
supply a custom stack to use, using the BSS_STACK() macro. If this
is not supplied, the crt0.S will assume that the loader has
supplied a usable stack.
In either case, the platform code communicates information to the
generic code (specifically, a PROM pointer for OF systems, and/or an
initrd image address supplied by the bootloader) via a global
structure "loader_info".
In addition the wrapper script is rearranged to ensure that the
platform .o is always linked first. This means that platforms where
the zImage entry point is at a fixed address or offset, rather than
being encoded in the binary header can be supported using option (1).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-05 03:24:52 +00:00
|
|
|
printf(" using OF tree (promptr=%p)\n\r", loader_info.promptr);
|
[POWERPC] Cleanup zImage handling of kernel entry with flat device tree
This makes 2 changes to clean up the flat device tree handling
logic in the zImage wrapper.
First, there were two callbacks from the dt_ops structure used for
producing a final flat tree to pass to the kerne: dt_ops.ft_pack()
which packed the flat tree (possibly a no-op) and dt_ops.ft_addr()
which retreived the address of the final blob. Since they were only
ever called together, this patch combines the two into a single new
callback, dt_ops.finalize(). This new callback does whatever
platform-dependent things are necessary to produce a final flat device
tree blob, and returns the blob's addres.
Second, the current logic calls the kernel with a flat device tree if
one is build into the zImage wrapper, otherwise it boots the kernel
with a PROM pointer, expecting the kernel to copy the OF device tree
itself. This approach precludes the possibility of the platform
wrapper code building a flat device tree from whatever
platform-specific information firmware provides. Thus, this patch
takes the more sensible approach of invoking the kernel with a flat
tree if the dt_ops.finalize callback provides one (by whatever means).
So, the dt_ops.finalize callback can be NULL, or can be a function
which returns NULL. In either case, the zImage wrapper logic assumes
that this is a platform with OF and invokes the kernel accordingly.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-21 00:37:37 +00:00
|
|
|
|
2006-09-19 04:05:08 +00:00
|
|
|
if (console_ops.close)
|
|
|
|
console_ops.close();
|
|
|
|
|
|
|
|
kentry = (kernel_entry_t) vmlinux.addr;
|
[POWERPC] Cleanup zImage handling of kernel entry with flat device tree
This makes 2 changes to clean up the flat device tree handling
logic in the zImage wrapper.
First, there were two callbacks from the dt_ops structure used for
producing a final flat tree to pass to the kerne: dt_ops.ft_pack()
which packed the flat tree (possibly a no-op) and dt_ops.ft_addr()
which retreived the address of the final blob. Since they were only
ever called together, this patch combines the two into a single new
callback, dt_ops.finalize(). This new callback does whatever
platform-dependent things are necessary to produce a final flat device
tree blob, and returns the blob's addres.
Second, the current logic calls the kernel with a flat device tree if
one is build into the zImage wrapper, otherwise it boots the kernel
with a PROM pointer, expecting the kernel to copy the OF device tree
itself. This approach precludes the possibility of the platform
wrapper code building a flat device tree from whatever
platform-specific information firmware provides. Thus, this patch
takes the more sensible approach of invoking the kernel with a flat
tree if the dt_ops.finalize callback provides one (by whatever means).
So, the dt_ops.finalize callback can be NULL, or can be a function
which returns NULL. In either case, the zImage wrapper logic assumes
that this is a platform with OF and invokes the kernel accordingly.
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-11-21 00:37:37 +00:00
|
|
|
if (ft_addr)
|
|
|
|
kentry(ft_addr, 0, NULL);
|
2006-09-19 04:05:08 +00:00
|
|
|
else
|
[POWERPC] zImage: Cleanup and improve zImage entry point
This patch re-organises the way the zImage wrapper code is entered, to
allow more flexibility on platforms with unusual entry conditions.
After this patch, a platform .o file has two options:
1) It can define a _zimage_start, in which case the platform code gets
control from the very beginning of execution. In this case the
platform code is responsible for relocating the zImage if necessary,
clearing the BSS, performing any platform specific initialization, and
finally calling start() to load and enter the kernel.
2) It can define platform_init(). In this case the generic crt0.S
handles initial entry, and calls platform_init() before calling
start(). The signature of platform_init() is changed, however, to
take up to 5 parameters (in r3..r7) as they come from the platform's
initial loader, instead of a fixed set of parameters based on OF's
usage.
When using the generic crt0.S, the platform .o can optionally
supply a custom stack to use, using the BSS_STACK() macro. If this
is not supplied, the crt0.S will assume that the loader has
supplied a usable stack.
In either case, the platform code communicates information to the
generic code (specifically, a PROM pointer for OF systems, and/or an
initrd image address supplied by the bootloader) via a global
structure "loader_info".
In addition the wrapper script is rearranged to ensure that the
platform .o is always linked first. This means that platforms where
the zImage entry point is at a fixed address or offset, rather than
being encoded in the binary header can be supported using option (1).
Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2007-03-05 03:24:52 +00:00
|
|
|
kentry((unsigned long)initrd.addr, initrd.size,
|
|
|
|
loader_info.promptr);
|
2006-09-19 04:05:08 +00:00
|
|
|
|
2007-03-21 15:02:44 +00:00
|
|
|
/* console closed so printf in fatal below may not work */
|
|
|
|
fatal("Error: Linux kernel returned to zImage boot wrapper!\n\r");
|
2006-09-19 04:05:08 +00:00
|
|
|
}
|