Attachment 306647 Details for Bug 239658 – Link zImage at 64Mb rather than 4Mb. Move real-base from 12Mb to 32Mb

Link zImage at 64Mb rather than 4Mb. Move real-base from 12Mb to 32Mb

bz-34545_move_zImage_link_address.diff (text/plain), 3.25 KB, created by IBM Bug Proxy on 2008-05-26 06:24:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: IBM Bug Proxy

Created: 2008-05-26 06:24:44 UTC

Size: 3.25 KB

patch

obsolete

>diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c
>index 8041a98..b1e5611 100644
>--- a/arch/powerpc/boot/addnote.c
>+++ b/arch/powerpc/boot/addnote.c
>@@ -25,7 +25,7 @@ char arch[] = "PowerPC";
> #define N_DESCR	6
> unsigned int descr[N_DESCR] = {
> 	0xffffffff,		/* real-mode = true */
>-	0x00c00000,		/* real-base, i.e. where we expect OF to be */
>+	0x02000000,		/* real-base, i.e. where we expect OF to be */
> 	0xffffffff,		/* real-size */
> 	0xffffffff,		/* virt-base */
> 	0xffffffff,		/* virt-size */
>diff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c
>index 95b8fd6..93a1a84 100644
>--- a/arch/powerpc/boot/oflib.c
>+++ b/arch/powerpc/boot/oflib.c
>@@ -168,8 +168,19 @@ void *of_claim(unsigned long virt, unsigned long size, unsigned long align)
> 
> void *of_vmlinux_alloc(unsigned long size)
> {
>-	void *p = malloc(size);
>-
>+	unsigned long start = (unsigned long)_start, end = (unsigned long)_end;
>+	void *addr;
>+	void *p;
>+
>+	/* With some older POWER4 firmware the we need to claim the area
>+	 * the kernel will reside in.  Newer firmwares don't need this so we
>+	 * just ignore the return value.
>+	 */
>+	addr = of_claim(start, end - start, 0);
>+	printf("Trying to claim from 0x%lx to 0x%lx (0x%lx) got %p\r\n",
>+	       start, end, end - start, addr);
>+
>+	p = malloc(size);
> 	if (!p)
> 		fatal("Can't allocate memory for kernel image!\n\r");
> 
>diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
>index d6c96d9..22bc26e 100755
>--- a/arch/powerpc/boot/wrapper
>+++ b/arch/powerpc/boot/wrapper
>@@ -138,14 +138,20 @@ objflags=-S
> tmp=$tmpdir/zImage.$$.o
> ksection=.kernel:vmlinux.strip
> isection=.kernel:initrd
>+link_address='0x400000'
> 
> case "$platform" in
>-pmac|pseries|chrp)
>+pseries)
>+    platformo=$object/of.o
>+    link_address='0x4000000'
>+    ;;
>+pmac|chrp)
>     platformo=$object/of.o
>     ;;
> coff)
>     platformo=$object/of.o
>     lds=$object/zImage.coff.lds
>+    link_address='0x500000'
>     ;;
> miboot|uboot)
>     # miboot and U-boot want just the bare bits, not an ELF binary
>@@ -190,6 +196,7 @@ ps3)
>     objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
>     ksection=.kernel:vmlinux.bin
>     isection=.kernel:initrd
>+    link_address=''
>     ;;
> ep88xc|ep405|ep8248e)
>     platformo="$object/fixed-head.o $object/$platform.o"
>@@ -268,7 +275,10 @@ if [ -n "$dtb" ]; then
> fi
> 
> if [ "$platform" != "miboot" ]; then
>-    ${CROSS}ld -m elf32ppc -T $lds -o "$ofile" \
>+    if [ -n "$link_address" ] ; then
>+        text_start="-Ttext $link_address --defsym _start=$link_address"
>+    fi
>+    ${CROSS}ld -m elf32ppc -T $lds $text_start -o "$ofile" \
> 	$platformo $tmp $object/wrapper.a
>     rm $tmp
> fi
>diff --git a/arch/powerpc/boot/zImage.coff.lds.S b/arch/powerpc/boot/zImage.coff.lds.S
>index fe87a90..856dc78 100644
>--- a/arch/powerpc/boot/zImage.coff.lds.S
>+++ b/arch/powerpc/boot/zImage.coff.lds.S
>@@ -3,7 +3,6 @@ ENTRY(_zimage_start_opd)
> EXTERN(_zimage_start_opd)
> SECTIONS
> {
>-  . = (5*1024*1024);
>   _start = .;
>   .text      :
>   {
>diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S
>index f6e380f..0962d62 100644
>--- a/arch/powerpc/boot/zImage.lds.S
>+++ b/arch/powerpc/boot/zImage.lds.S
>@@ -3,7 +3,6 @@ ENTRY(_zimage_start)
> EXTERN(_zimage_start)
> SECTIONS
> {
>-  . = (4*1024*1024);
>   _start = .;
>   .text      :
>   {

Actions: View

Attachments on bug 239658: 306647