2004-09-14 Hollis Blanchard <hollis@penguinppc.org>

	* kern/powerpc/ieee1275/init.c (abort): Trap into Open Firmware.

	* term/powerpc/ieee1275/ofconsole.c (grub_ofconsole_gotoxy): Use
	`y + 1' instead of `y - 1'.

	* conf/powerpc-ieee1275.rmk (grubof_LDFLAGS): Add `-N' and `-S'.

diff --git a/ChangeLog b/ChangeLog
index 2f635990c9d58d1178d40ee68479f91bdcf5b6cd..6496b924c159426b4d3573e52e7ae834aa3ab4ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-09-14  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * kern/powerpc/ieee1275/init.c (abort): Trap into Open Firmware.
+
+       * term/powerpc/ieee1275/ofconsole.c (grub_ofconsole_gotoxy): Use
+       `y + 1' instead of `y - 1'.
+
+       * conf/powerpc-ieee1275.rmk (grubof_LDFLAGS): Add `-N' and `-S'.
+       
 2004-09-14  Yoshinori K. Okuji  <okuji@enbug.org>
 
        From Hollis Blanchard <hollis@penguinppc.org>:

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 9b98537b09558cc15358f7c34f953e5e3f0da68e..d3ee7b198a7952f63b13ecc676bcc692f5970fa8 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -618,7 +618,7 @@ grubof-commands_boot.d: commands/boot.c
 grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 grubof_CFLAGS = $(COMMON_CFLAGS)
 grubof_ASFLAGS = $(COMMON_ASFLAGS)
-grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-Ttext,0x200000,-Bstatic
+grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 4ce0549591c40b7c07b6611d70ce8d2495bf6004..78795ceba1db7f787a62408e831b69f524dc0f22 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -46,7 +46,7 @@ grubof_SOURCES = boot/powerpc/ieee1275/cmain.c boot/powerpc/ieee1275/ieee1275.c
 grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 grubof_CFLAGS = $(COMMON_CFLAGS)
 grubof_ASFLAGS = $(COMMON_ASFLAGS)
-grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-Ttext,0x200000,-Bstatic
+grubof_LDFLAGS = -nostdlib -static-libgcc -lgcc -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # For genmoddep.
 genmoddep_SOURCES = util/genmoddep.c

diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c
index 7cf5e9e862aa6743dd7e85ef7c3bc7c710bbe5f9..e3165676ae2f6b91e03026facfeada559bd30478 100644 (file)
--- a/kern/powerpc/ieee1275/init.c
+++ b/kern/powerpc/ieee1275/init.c
@@ -40,6 +40,9 @@ grub_addr_t grub_total_module_size = 0;
 void
 abort (void)
 {
+  /* Trap to Open Firmware.  */
+  asm ("trap");
+  
   for (;;);
 }
 

diff --git a/term/powerpc/ieee1275/ofconsole.c b/term/powerpc/ieee1275/ofconsole.c
index 2befd85f16c26c1e668dea7cdefaa6c1ca5d74e2..83c22d08d7a9aa179c3f56e82474c09c5eaeb89b 100644 (file)
--- a/term/powerpc/ieee1275/ofconsole.c
+++ b/term/powerpc/ieee1275/ofconsole.c
@@ -214,7 +214,7 @@ grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
   grub_curr_x = x;
   grub_curr_y = y;
 
-  grub_sprintf (s, "\e[%d;%dH", y - 1, x + 1);
+  grub_sprintf (s, "\e[%d;%dH", y + 1, x + 1);
   grub_ofconsole_writeesc (s);
 }