From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 14:38:17 +0000 (+0100)
Subject: 	Merge sparc grub-mkimage into generic grub-mkimage and a.out support.
X-Git-Tag: 1.99~1020
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=601c97c035683de1157f6fa4302566bfb763b7a4;p=thirdparty%2Fgrub.git

	Merge sparc grub-mkimage into generic grub-mkimage and a.out support.

	* boot/sparc64/ieee1275/boot.S (boot_continue): Use SCRATCH_PAD_BOOT
	as scratch.
	* boot/sparc64/ieee1275/diskboot.S (after_info_block): Use
	SCRATCH_PAD_DISKBOOT as scratch.
	(bootit): Pass Openfirmware pointer in %o4.
	* conf/sparc64-ieee1275.rmk (kernel_img_LDFLAGS): Link at 0x4400 instead
	of 0x200000.
	(grub_mkimage_SOURCES): Replace util/sparc64/ieee1275/grub-mkimage.c
	with util/grub-mkrawimage.c.
	* configure.ac: Handle GRUB_MACHINE_SPARC64 and GRUB_MACHINE_MIPS.
	* include/grub/aout.h (AOUT_MID_SUN): New definition.
	(grub_aout_get_type) [GRUB_UTIL]: Removed.
	(grub_aout_load) [GRUB_UTIL]: Likewise.
	* include/grub/kernel.h (grub_modules_get_end): New proto.
	* include/grub/sparc64/ieee1275/boot.h (SCRATCH_PAD): Removed.
	(SCRATCH_PAD_BOOT): New definition.
	(SCRATCH_PAD_DISKBOOT): Likewise.
	(GRUB_BOOT_MACHINE_IMAGE_ADDRESS): Set to 0x4400.
	* include/grub/sparc64/ieee1275/ieee1275.h
	(grub_ieee1275_original_stack): New variable
	* include/grub/sparc64/ieee1275/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
	New definition
	(GRUB_KERNEL_MACHINE_STACK_SIZE): Likewise.
	(GRUB_PLATFORM_IMAGE_FORMATS): Likewise.
	(GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT): Likewise.
	(GRUB_PLATFORM_IMAGE_DEFAULT): Likewise.
	(GRUB_PLATFORM_IMAGE_RAW): Likewise.
	(GRUB_PLATFORM_IMAGE_AOUT): Likewise.
	(grub_platform_image_format_t): New type.
	* kern/mips/yeeloong/init.c (grub_modules_get_end): Move from here ...
	* kern/main.c (grub_modules_get_end)
	[GRUB_MACHINE_MIPS_YEELOONG || GRUB_MACHINE_SPARC64]: ... here.
	* kern/sparc64/ieee1275/crt0.S: Store firmware entry point in %o0.
	(codestart): Switch stacks.
	* kern/sparc64/ieee1275/init.c (grub_ieee1275_original_stack): New
	variable.
	(grub_heap_init): Use grub_modules_get_end.
	* loader/sparc64/ieee1275/linux.c (grub_linux_boot): Restore original
	stack.
	* util/grub-mkrawimage.c (generate_image): Support sparc64.
	(main): Likewise.
	* util/sparc64/ieee1275/grub-mkimage.c: Removed.
---

601c97c035683de1157f6fa4302566bfb763b7a4
diff --cc ChangeLog
index 1977f24ad,1977f24ad..2cd6f2655
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,50 @@@
++2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	Merge sparc grub-mkimage into generic grub-mkimage and a.out support.
++
++	* boot/sparc64/ieee1275/boot.S (boot_continue): Use SCRATCH_PAD_BOOT
++	as scratch.
++	* boot/sparc64/ieee1275/diskboot.S (after_info_block): Use
++	SCRATCH_PAD_DISKBOOT as scratch.
++	(bootit): Pass Openfirmware pointer in %o4.
++	* conf/sparc64-ieee1275.rmk (kernel_img_LDFLAGS): Link at 0x4400 instead
++	of 0x200000.
++	(grub_mkimage_SOURCES): Replace util/sparc64/ieee1275/grub-mkimage.c
++	with util/grub-mkrawimage.c.
++	* configure.ac: Handle GRUB_MACHINE_SPARC64 and GRUB_MACHINE_MIPS.
++	* include/grub/aout.h (AOUT_MID_SUN): New definition.
++	(grub_aout_get_type) [GRUB_UTIL]: Removed.
++	(grub_aout_load) [GRUB_UTIL]: Likewise.
++	* include/grub/kernel.h (grub_modules_get_end): New proto.
++	* include/grub/sparc64/ieee1275/boot.h (SCRATCH_PAD): Removed.
++	(SCRATCH_PAD_BOOT): New definition.
++	(SCRATCH_PAD_DISKBOOT): Likewise.
++	(GRUB_BOOT_MACHINE_IMAGE_ADDRESS): Set to 0x4400.
++	* include/grub/sparc64/ieee1275/ieee1275.h
++	(grub_ieee1275_original_stack): New variable
++	* include/grub/sparc64/ieee1275/kernel.h (GRUB_KERNEL_MACHINE_RAW_SIZE):
++	New definition
++	(GRUB_KERNEL_MACHINE_STACK_SIZE): Likewise.
++	(GRUB_PLATFORM_IMAGE_FORMATS): Likewise.
++	(GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT): Likewise.
++	(GRUB_PLATFORM_IMAGE_DEFAULT): Likewise.
++	(GRUB_PLATFORM_IMAGE_RAW): Likewise.
++	(GRUB_PLATFORM_IMAGE_AOUT): Likewise.
++	(grub_platform_image_format_t): New type.
++	* kern/mips/yeeloong/init.c (grub_modules_get_end): Move from here ...
++	* kern/main.c (grub_modules_get_end)
++	[GRUB_MACHINE_MIPS_YEELOONG || GRUB_MACHINE_SPARC64]: ... here.
++	* kern/sparc64/ieee1275/crt0.S: Store firmware entry point in %o0.
++	(codestart): Switch stacks.
++	* kern/sparc64/ieee1275/init.c (grub_ieee1275_original_stack): New
++	variable.
++	(grub_heap_init): Use grub_modules_get_end.
++	* loader/sparc64/ieee1275/linux.c (grub_linux_boot): Restore original
++	stack.
++	* util/grub-mkrawimage.c (generate_image): Support sparc64.
++	(main): Likewise.
++	* util/sparc64/ieee1275/grub-mkimage.c: Removed.
++
  2010-03-14  Thorsten Glaser <tg@mirbsd.org>
  
  	* util/grub-mkrescue.in: Base ISO UUID on UTC.