* conf/powerpc-ieee1275.rmk (kernel_elf_LDFLAGS): Change link address

        to 0x200000 (avoids trouble with some OFW implementations, and matches
        with the one in Yaboot).
        Reported by Manoel Abranches

diff --git a/ChangeLog b/ChangeLog
index 5a6d71773534b33da1906f3bfceba45211ec2c4b..beccd79c133f5762b5b766b0874fdcc64ccafc16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,11 @@
        * kern/i386/loader.S (grub_multiboot_backward_relocator): Improve
        comments.  Avoid copiing one more byte than necessary (just in case).
 
+       * conf/powerpc-ieee1275.rmk (kernel_elf_LDFLAGS): Change link address
+       to 0x200000 (avoids trouble with some OFW implementations, and matches
+       with the one in Yaboot).
+       Reported by Manoel Abranches
+
 2008-11-20  Robert Millan  <rmh@aybabtu.com>
 
        * kern/i386/coreboot/init.c (grub_time_tics): Remove variable.

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 908c6a3146a4994a1c721e7ba3c1026833740af0..5139fbdccd23206b29b28e7709bc832dc704aec2 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -548,7 +548,7 @@ kernel_elf_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 kernel_elf_CFLAGS = $(COMMON_CFLAGS)
 kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-       -Wl,-N,-S,-Ttext,0x10000,-Bstatic
+       -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 5b2bf53f313f27d7deb3458fe4e32a49f14e8894..014bf412ffe14ed0d527f2863d04ca14636886ae 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -85,7 +85,7 @@ kernel_elf_HEADERS = grub/powerpc/ieee1275/ieee1275.h
 kernel_elf_CFLAGS = $(COMMON_CFLAGS)
 kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-       -Wl,-N,-S,-Ttext,0x10000,-Bstatic
+       -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install