diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-11-05 10:09:11 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-11-05 10:09:11 +1100 |
| commit | 44790a0b93d8481a8dc5bf6aa600941627b56d56 (patch) | |
| tree | 6ef5242b5a8864418549a4e4b63a6441ce3ed7f6 /arch/powerpc/boot/wrapper | |
| parent | Merge remote-tracking branch 'agust/next' into next (diff) | |
| download | linux-dev-44790a0b93d8481a8dc5bf6aa600941627b56d56.tar.xz linux-dev-44790a0b93d8481a8dc5bf6aa600941627b56d56.zip | |
powerpc/boot: Properly handle the base "of" boot wrapper
The wrapper script needs an explicit rule for the "of" boot
wrapper (generic wrapper, similar to pseries). Before
0c9fa29149d3726e14262aeb0c8461a948cc9d56 it was hanlded
implicitly by the statement:
platformo=$object/"$platform".o
But now that epapr.o needs to be added, that doesn't work
and an explicit rule must be added.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/boot/wrapper')
| -rwxr-xr-x | arch/powerpc/boot/wrapper | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index ac16e9984ecb..2e1af74a64be 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper @@ -147,6 +147,10 @@ link_address='0x400000' make_space=y case "$platform" in +of) + platformo="$object/of.o $object/epapr.o" + make_space=n + ;; pseries) platformo="$object/of.o $object/epapr.o" link_address='0x4000000' |