diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-11-09 16:00:06 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-11-09 16:00:06 +1100 |
| commit | 621da0f8af228525e4b40390e36fbdc44a587cf1 (patch) | |
| tree | 71683a01442fa7fa213ad4a5b317764cd32d374c /arch | |
| parent | 48797ebd9e8b16fddcd4ef062f792314a6b9219a (diff) | |
| download | lwn-621da0f8af228525e4b40390e36fbdc44a587cf1.tar.gz lwn-621da0f8af228525e4b40390e36fbdc44a587cf1.zip | |
[POWERPC] Make sure initrd and dtb sections get into zImage correctly
The "wrapper" script was using the wrong names for the initrd and
dtb (device-tree blob) sections. This fixes it, and also ensures
the symbols for the start and end of the dtb get defined correctly.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 4 | ||||
| -rw-r--r-- | arch/powerpc/boot/zImage.lds.S | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index eab7318729e9..b5fb1fee76f8 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -179,11 +179,11 @@ if [ -z "$cacheit" ]; then fi if [ -n "$initrd" ]; then - addsec $tmp "$initrd" initrd + addsec $tmp "$initrd" $isection fi if [ -n "$dtb" ]; then - addsec $tmp "$dtb" dtb + addsec $tmp "$dtb" .kernel:dtb fi if [ "$platform" != "miboot" ]; then diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S index 4b6bb3ffe3dc..4be3c6414b04 100644 --- a/arch/powerpc/boot/zImage.lds.S +++ b/arch/powerpc/boot/zImage.lds.S @@ -21,6 +21,11 @@ SECTIONS __got2_end = .; } + . = ALIGN(8); + _dtb_start = .; + .kernel:dtb : { *(.kernel:dtb) } + _dtb_end = .; + . = ALIGN(4096); _vmlinux_start = .; .kernel:vmlinux.strip : { *(.kernel:vmlinux.strip) } |