From da75ac715792d571d6aceea4ad16d5645ec8f362 Mon Sep 17 00:00:00 2001 From: marco_g Date: Tue, 14 Sep 2004 21:21:12 +0000 Subject: [PATCH] 2004-09-14 Hollis Blanchard * 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'. --- ChangeLog | 9 +++++++++ conf/powerpc-ieee1275.mk | 2 +- conf/powerpc-ieee1275.rmk | 2 +- kern/powerpc/ieee1275/init.c | 3 +++ term/powerpc/ieee1275/ofconsole.c | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f635990c..6496b924c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-09-14 Hollis Blanchard + + * 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 From Hollis Blanchard : diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk index 9b98537b0..d3ee7b198 100644 --- 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 4ce054959..78795ceba 100644 --- 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 7cf5e9e86..e3165676a 100644 --- 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 2befd85f1..83c22d08d 100644 --- 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); }