diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-09-24 16:10:38 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-09-25 14:18:44 +1000 |
| commit | 0c9fa29149d3726e14262aeb0c8461a948cc9d56 (patch) | |
| tree | c154e494cf2898fa88f5160cf816f30863e9c8cc /arch/powerpc/boot/wrapper | |
| parent | powerpc: Remove ksp_limit on ppc64 (diff) | |
| download | linux-dev-0c9fa29149d3726e14262aeb0c8461a948cc9d56.tar.xz linux-dev-0c9fa29149d3726e14262aeb0c8461a948cc9d56.zip | |
powerpc/zImage: make the "OF" wrapper support ePAPR boot
This makes the "OF" zImage wrapper (zImage.pseries, zImage.pmac,
zImage.maple) work if booted via a flat device-tree (ePAPR boot
mode), and thus potentially usable with kexec.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to '')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 6761c746048d..cd7af841ba05 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -148,18 +148,18 @@ make_space=y case "$platform" in pseries) - platformo=$object/of.o + platformo="$object/of.o $object/epapr.o" link_address='0x4000000' ;; maple) - platformo=$object/of.o + platformo="$object/of.o $object/epapr.o" link_address='0x400000' ;; pmac|chrp) - platformo=$object/of.o + platformo="$object/of.o $object/epapr.o" ;; coff) - platformo="$object/crt0.o $object/of.o" + platformo="$object/crt0.o $object/of.o $object/epapr.o" lds=$object/zImage.coff.lds link_address='0x500000' pie= @@ -253,6 +253,7 @@ treeboot-iss4xx-mpic) platformo="$object/treeboot-iss4xx.o" ;; epapr) + platformo="$object/epapr.o $object/epapr-wrapper.o" link_address='0x20000000' pie=-pie ;; |