2008-08-29 Pavel Roskin <proski@gnu.org>

	* kern/powerpc/ieee1275/crt0.S: Include grub/symbol.h and
	grub/cpu/kernel.h.  Add start label for consistency with other
	platforms.  Add grub_prefix immediately after start.  Add jump
	to the code after grub_prefix.
	* include/grub/powerpc/kernel.h: Provide valid values for
	GRUB_KERNEL_CPU_PREFIX and GRUB_KERNEL_CPU_DATA_END.

diff --git a/ChangeLog b/ChangeLog
index 17b7ef60517109790084db09b687bd7c3570a739..42c9ebdeb4cb5a5b604efb57e8b3244f9e9da4a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-29  Pavel Roskin  <proski@gnu.org>
+
+       * kern/powerpc/ieee1275/crt0.S: Include grub/symbol.h and
+       grub/cpu/kernel.h.  Add start label for consistency with other
+       platforms.  Add grub_prefix immediately after start.  Add jump
+       to the code after grub_prefix.
+       * include/grub/powerpc/kernel.h: Provide valid values for
+       GRUB_KERNEL_CPU_PREFIX and GRUB_KERNEL_CPU_DATA_END.
+
 2008-08-29  Bean  <bean123ch@gmail.com>
 
        * configure.ac: Change host_os to cygwin for mingw.

diff --git a/include/grub/powerpc/kernel.h b/include/grub/powerpc/kernel.h
index 2bcc3785de36519b4f96db7ec7d20d49f217fba1..b4687337f30325d809e10b47879071052023d49b 100644 (file)
--- a/include/grub/powerpc/kernel.h
+++ b/include/grub/powerpc/kernel.h
@@ -26,8 +26,7 @@
    rewrite grub-mkimage to generate valid ELF files.  */
 #define GRUB_MOD_GAP 0x8000
 
-/* prefix not supported on powerpc yet.  */
-#define GRUB_KERNEL_CPU_PREFIX 0
-#define GRUB_KERNEL_CPU_DATA_END       0
+#define GRUB_KERNEL_CPU_PREFIX         0x4
+#define GRUB_KERNEL_CPU_DATA_END       0x44
 
 #endif

diff --git a/kern/powerpc/ieee1275/crt0.S b/kern/powerpc/ieee1275/crt0.S
index fac99d6b0dade9f78ef20ac3070913814f808388..35d6133e2db7b34b53d800ea32a69e8e6eca2f19 100644 (file)
--- a/kern/powerpc/ieee1275/crt0.S
+++ b/kern/powerpc/ieee1275/crt0.S
@@ -17,13 +17,31 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/symbol.h>
+#include <grub/cpu/kernel.h>
+
 .extern __bss_start
 .extern _end
 
        .text
        .align  2
-       .globl  _start
-_start:        
+       .globl  start, _start
+start:
+_start:
+       b       codestart
+
+       . = EXT_C(start) + GRUB_KERNEL_CPU_PREFIX
+
+VARIABLE(grub_prefix)
+       /* to be filled by grub-mkelfimage */
+
+       /*
+        *  Leave some breathing room for the prefix.
+        */
+
+       . = EXT_C(start) + GRUB_KERNEL_CPU_DATA_END
+
+codestart:
        li      2, 0
        li      13, 0