diff mbox

[2/4] powerpc/boot/wrapper: use the pseries wrapper for zImage.epapr

Message ID 1423570510.218746.573015373614.2.gpush@pablo (mailing list archive)
State Accepted
Commit 90d1d44e0de0ec833634667bc1827303b2e1645e
Delegated to: Michael Ellerman
Headers show

Commit Message

Jeremy Kerr Feb. 10, 2015, 12:15 p.m. UTC
We'll likely be entering the zImage.epapr as BE, so include the pseries
implementation of _zimage_start, which adds the endian fixup magic.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

---
 arch/powerpc/boot/wrapper |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Benjamin Herrenschmidt Feb. 11, 2015, 2:12 a.m. UTC | #1
On Tue, 2015-02-10 at 20:15 +0800, Jeremy Kerr wrote:
> We'll likely be entering the zImage.epapr as BE, so include the pseries
> implementation of _zimage_start, which adds the endian fixup magic.

Wont that break embedded epapr stuff ?

> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
> 
> ---
>  arch/powerpc/boot/wrapper |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
> index ae0f88e..3f50c27 100755
> --- a/arch/powerpc/boot/wrapper
> +++ b/arch/powerpc/boot/wrapper
> @@ -277,7 +277,7 @@ treeboot-iss4xx-mpic)
>      platformo="$object/treeboot-iss4xx.o"
>      ;;
>  epapr)
> -    platformo="$object/epapr.o $object/epapr-wrapper.o"
> +    platformo="$object/pseries-head.o $object/epapr.o $object/epapr-wrapper.o"
>      link_address='0x20000000'
>      pie=-pie
>      ;;
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
Jeremy Kerr Feb. 11, 2015, 2:16 a.m. UTC | #2
Hi Ben,

>> We'll likely be entering the zImage.epapr as BE, so include the pseries
>> implementation of _zimage_start, which adds the endian fixup magic.
> 
> Wont that break embedded epapr stuff ?

How so? This will just give us the endian fixup trampoline (followed by
a branch to _zimage_start_lib) as the entry point, rather than directly
entering _zimage_start_lib. Will that not work on embedded?

Cheers,


Jeremy
Benjamin Herrenschmidt Feb. 11, 2015, 2:20 a.m. UTC | #3
On Wed, 2015-02-11 at 10:16 +0800, Jeremy Kerr wrote:
> Hi Ben,
> 
> >> We'll likely be entering the zImage.epapr as BE, so include the pseries
> >> implementation of _zimage_start, which adds the endian fixup magic.
> > 
> > Wont that break embedded epapr stuff ?
> 
> How so? This will just give us the endian fixup trampoline (followed by
> a branch to _zimage_start_lib) as the entry point, rather than directly
> entering _zimage_start_lib. Will that not work on embedded?

Hrm, the trampoline only works on server, so it would have a weird
effect if booting embedded with the wrong endian, but ok.

Ben.
diff mbox

Patch

diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index ae0f88e..3f50c27 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -277,7 +277,7 @@  treeboot-iss4xx-mpic)
     platformo="$object/treeboot-iss4xx.o"
     ;;
 epapr)
-    platformo="$object/epapr.o $object/epapr-wrapper.o"
+    platformo="$object/pseries-head.o $object/epapr.o $object/epapr-wrapper.o"
     link_address='0x20000000'
     pie=-pie
     ;;