: grub: Add revamped kernel startup code for sparc64.
PATCH 1/1 : grub: Add revamped kernel startup code for sparc64.
I've commited these changes.
2009-04-12 David S. Miller <[email protected]>
* kern/sparc64/ieee1275/init.c: Delete, replace with...
* kern/sparc64/ieee1275/crt0.S: assembler implementation.
* include/grub/sparc64/ieee1275/kernel.h: Declare grub_prefix[]. (GRUB_MOD_ALIGN, GRUB_MOD_GAP, GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE, GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE, GRUB_KERNEL_MACHINE_COMPRESSED_SIZE, GRUB_KERNEL_MACHINE_PREFIX, GRUB_KERNEL_MACHINE_DATA_END): Define. (grub_kernel_image_size, grub_total_module_size): Declare.
--- include/grub/sparc64/ieee1275/kernel.h | 38 +++++- kern/sparc64/ieee1275/crt0.S | 77 ++++++++++ kern/sparc64/ieee1275/init.c | 237 -------------------------------- 3 files changed, 112 insertions(+), 240 deletions(-) create mode 100644 kern/sparc64/ieee1275/crt0.S delete mode 100644 kern/sparc64/ieee1275/init.c
include/grub/sparc64/ieee1275/kernel.h +35 -3
@@ -1,6 +1,6 @@/* * GRUB -- GRand Unified Bootloader -* Copyright (C) 2005,2007 Free Software Foundation, Inc. +* Copyright (C) 2005,2007,2009 Free Software Foundation, Inc. * * GRUB is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -19,12 +19,44 @@#ifndef GRUB_KERNEL_MACHINE_HEADER #define GRUB_KERNEL_MACHINE_HEADER 1 +#define GRUB_MOD_ALIGN 0x2000 + +/* Non-zero value is only needed for PowerMacs. */ +#define GRUB_MOD_GAP 0x0 + +/* The offset of GRUB_TOTAL_MODULE_SIZE. */ +#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE 0x8 + +/* The offset of GRUB_KERNEL_IMAGE_SIZE. */ +#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE 0xc + +/* The offset of GRUB_COMPRESSED_SIZE. */ +#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE 0x10 + +/* The offset of GRUB_PREFIX. */ +#define GRUB_KERNEL_MACHINE_PREFIX 0x14 + +/* End of the data section. */ +#define GRUB_KERNEL_MACHINE_DATA_END 0x114 + +#ifndef ASM_FILE +#include <grub/symbol.h> +#include <grub/types.h> + +/* The size of kernel image. */ +extern grub_int32_t grub_kernel_image_size; + +/* The total size of module images following the kernel. */ +extern grub_int32_t grub_total_module_size; + +/* The prefix which points to the directory where GRUB modules and its +configuration file are located. */ +extern char grub_prefix[];void EXPORT_FUNC (grub_reboot ) (void );void EXPORT_FUNC (grub_halt ) (void ); -/* Where grub-mkimage places the core modules in memory. */ -#define GRUB_IEEE1275_MODULE_BASE 0x00300000 +#endif /* ! ASM_FILE */ #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
kern/sparc64/ieee1275/crt0.S new file +77 -0
77 lines not on this page · raw message
kern/sparc64/ieee1275/init.c deleted +0 -237
237 lines not on this page · raw message
Signature · 1 line
1.6.2.3