2007-02-21 Hollis Blanchard <hollis@penguinppc.org>

	* conf/powerpc-ieee1275.rmk (kernel_elf_LDFLAGS): Link at 64KB.
	* kern/powerpc/ieee1275/init.c (_end): Add declaration.
	(_start): Likewise.
	(grub_arch_modules_addr): Return address after `_end'.
	* util/powerpc/ieee1275/grub-mkimage.c: Include grub/misc.h.
	(load_modules): Use new parameter as `p_paddr' and `p_vaddr'.
	(add_segments): Calculate `_end' from phdr size and location.
	(ALIGN_UP): Moved to ...
	* include/grub/misc.h: here.
	* include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MOD_ALIGN):
	New macro.
	(GRUB_IEEE1275_MODULE_BASE): Removed.

diff --git a/ChangeLog b/ChangeLog
index 9f825c2248c8c9a85965f9019538aac79cdbd854..24e5db8cb5be3d5df5eed7476ed22f442d2f6a34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-02-21  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * conf/powerpc-ieee1275.rmk (kernel_elf_LDFLAGS): Link at 64KB.
+       * kern/powerpc/ieee1275/init.c (_end): Add declaration.
+       (_start): Likewise.
+       (grub_arch_modules_addr): Return address after `_end'.
+       * util/powerpc/ieee1275/grub-mkimage.c: Include grub/misc.h.
+       (load_modules): Use new parameter as `p_paddr' and `p_vaddr'.
+       (add_segments): Calculate `_end' from phdr size and location.
+       (ALIGN_UP): Moved to ...
+       * include/grub/misc.h: here.
+       * include/grub/powerpc/ieee1275/kernel.h (GRUB_IEEE1275_MOD_ALIGN):
+       New macro.
+       (GRUB_IEEE1275_MODULE_BASE): Removed.
+
 2007-02-20  Hollis Blanchard  <hollis@penguinppc.org>
 
        * kern/powerpc/ieee1275/openfw.c (grub_available_iterate): Correct

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 04212b8a4b41aa319e7ec061e9624e521c3a12de..84f7baf120bafbf2b0c0fcb598a353352e4b09fa 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -468,7 +468,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,0x200000,-Bstatic
+       -Wl,-N,-S,-Ttext,0x10000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install
@@ -1004,3 +1004,4 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 include $(srcdir)/conf/common.mk
+

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 937c74ebd34c7b86bec108874a97bc20e3426130..f7b5086927a9db1ecdd0c053dc41782eff517c20 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -74,7 +74,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,0x200000,-Bstatic
+       -Wl,-N,-S,-Ttext,0x10000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install
@@ -127,3 +127,4 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 include $(srcdir)/conf/common.mk
+

diff --git a/include/grub/misc.h b/include/grub/misc.h
index b0aff910d41d8442652d95c079aeaa76a1d4aebd..5121a502b832439c407d84ffa5f35c8f015e8e34 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -26,6 +26,8 @@
 #include <grub/symbol.h>
 #include <grub/err.h>
 
+#define ALIGN_UP(addr, align) ((long)((char *)addr + align - 1) & ~(align - 1))
+
 #define grub_dprintf(condition, fmt, args...) grub_real_dprintf(__FILE__, __LINE__, condition, fmt, ## args);
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)     grub_memmove ((d), (s), (n))

diff --git a/include/grub/powerpc/ieee1275/kernel.h b/include/grub/powerpc/ieee1275/kernel.h
index 4754e1939a827abcba0c8f5ac7019906d47a657d..d0d6e337d3429a4d4827114cb3172e85e652c979 100644 (file)
--- a/include/grub/powerpc/ieee1275/kernel.h
+++ b/include/grub/powerpc/ieee1275/kernel.h
@@ -22,10 +22,9 @@
 
 #include <grub/symbol.h>
 
+#define GRUB_IEEE1275_MOD_ALIGN 0x1000
+
 void EXPORT_FUNC (grub_reboot) (void);
 void EXPORT_FUNC (grub_halt) (void);
 
-/* Where grub-mkimage places the core modules in memory.  */
-#define GRUB_IEEE1275_MODULE_BASE 0x00300000
-
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */

diff --git a/kern/powerpc/ieee1275/init.c b/kern/powerpc/ieee1275/init.c
index 435cc5360617f9b0bb4daac0ce6a874e36fbd670..4afdc014b8ec887424b231c38310380d66d2ea00 100644 (file)
--- a/kern/powerpc/ieee1275/init.c
+++ b/kern/powerpc/ieee1275/init.c
@@ -36,6 +36,9 @@
 
 #define HEAP_SIZE (8<<20) /* 8 MiB */
 
+extern char _start[];
+extern char _end[];
+
 void
 grub_exit (void)
 {
@@ -205,5 +208,5 @@ grub_get_rtc (void)
 grub_addr_t
 grub_arch_modules_addr (void)
 {
-  return GRUB_IEEE1275_MODULE_BASE;
+  return ALIGN_UP(_end, GRUB_IEEE1275_MOD_ALIGN);
 }

diff --git a/util/powerpc/ieee1275/grub-mkimage.c b/util/powerpc/ieee1275/grub-mkimage.c
index 67896b8b3c822d01ffa485cc32b4a8df1d13f3c3..f82eba83127f6612b597a7610aa2d0eeadc7c2f8 100644 (file)
--- a/util/powerpc/ieee1275/grub-mkimage.c
+++ b/util/powerpc/ieee1275/grub-mkimage.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2005,2006  Free Software Foundation, Inc.
+ *  Copyright (C) 2004,2005,2006,2007  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,13 +27,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <grub/elf.h>
+#include <grub/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
 #include <grub/machine/kernel.h>
 
-#define ALIGN_UP(addr, align) ((long)((char *)addr + align - 1) & ~(align - 1))
-
 #define GRUB_IEEE1275_NOTE_NAME "PowerPC"
 #define GRUB_IEEE1275_NOTE_TYPE 0x1275
 
@@ -98,7 +97,8 @@ load_note (Elf32_Phdr *phdr, FILE *out)
 }
 
 void
-load_modules (Elf32_Phdr *phdr, const char *dir, char *mods[], FILE *out)
+load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
+             char *mods[], FILE *out)
 {
   char *module_img;
   struct grub_util_path_list *path_list;
@@ -152,8 +152,8 @@ load_modules (Elf32_Phdr *phdr, const char *dir, char *mods[], FILE *out)
   phdr->p_type = grub_cpu_to_be32 (PT_LOAD);
   phdr->p_flags = grub_cpu_to_be32 (PF_R | PF_W | PF_X);
   phdr->p_align = grub_cpu_to_be32 (sizeof (long));
-  phdr->p_vaddr = grub_cpu_to_be32 (GRUB_IEEE1275_MODULE_BASE);
-  phdr->p_paddr = grub_cpu_to_be32 (GRUB_IEEE1275_MODULE_BASE);
+  phdr->p_vaddr = grub_cpu_to_be32 (modbase);
+  phdr->p_paddr = grub_cpu_to_be32 (modbase);
   phdr->p_filesz = grub_cpu_to_be32 (total_module_size);
   phdr->p_memsz = grub_cpu_to_be32 (total_module_size);
 }
@@ -166,6 +166,7 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
   Elf32_Phdr *phdr;
   FILE *in;
   char *kernel_path;
+  grub_addr_t grub_end = 0;
   off_t phdroff;
   int i;
 
@@ -183,6 +184,7 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
   for (i = 0; i < grub_be_to_cpu16 (ehdr.e_phnum); i++)
     {
       char *segment_img;
+      grub_size_t segment_end;
 
       phdr = phdrs + i;
 
@@ -194,6 +196,13 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
       grub_util_info ("copying segment %d, type %d", i,
                      grub_be_to_cpu32 (phdr->p_type));
 
+      /* Locate _end.  */
+      segment_end = grub_be_to_cpu32 (phdr->p_paddr)
+                   + grub_be_to_cpu32 (phdr->p_memsz);
+      grub_util_info ("segment %u end 0x%lx", i, segment_end);
+      if (segment_end > grub_end)
+       grub_end = segment_end;
+
       /* Read segment data and write it to new file.  */
       segment_img = xmalloc (grub_be_to_cpu32 (phdr->p_filesz));
   
@@ -207,6 +216,11 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
 
   if (mods[0] != NULL)
     {
+      grub_addr_t modbase;
+
+      /* Place modules just after grub segment.  */
+      modbase = ALIGN_UP(grub_end, GRUB_IEEE1275_MOD_ALIGN);
+
       /* Construct new segment header for modules.  */
       phdr = phdrs + grub_be_to_cpu16 (ehdr.e_phnum);
       ehdr.e_phnum = grub_cpu_to_be16 (grub_be_to_cpu16 (ehdr.e_phnum) + 1);
@@ -215,7 +229,7 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[])
       phdr->p_offset = grub_cpu_to_be32 (ALIGN_UP (grub_util_get_fp_size (out),
                                                   sizeof (long)));
 
-      load_modules (phdr, dir, mods, out);
+      load_modules (modbase, phdr, dir, mods, out);
     }
 
   if (chrp)