diff --git a/ChangeLog b/ChangeLog index 5a6d71773..beccd79c1 100644 --- 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 * kern/i386/coreboot/init.c (grub_time_tics): Remove variable. diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk index 908c6a314..5139fbdcc 100644 --- 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 5b2bf53f3..014bf412f 100644 --- 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