diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2008-02-06 13:18:34 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 19:40:19 -0500 |
commit | 25431333813686654907ab987fb5de10c10a16db (patch) | |
tree | c641d4c3ffbf28ebd19b02f1103b9bbfb65a61fe /arch/powerpc/boot/wrapper | |
parent | 1daa6d08d1257aa61f376c3cc4795660877fb9e3 (diff) |
[POWERPC] bootwrapper: Build multiple cuImages
Currently, the kernel uses CONFIG_DEVICE_TREE to wrap a kernel image
with a fdt blob which means for any given configuration only one dts
file can be selected and so support for only one board can be built
This moves the selection of the default .dts file out of the kernel
config and into the bootwrapper makefile. The makefile chooses which
images to build based on the kernel config and the dts source file
name is taken directly from the image name. For example "cuImage.ebony"
will use "ebony.dts" as the device tree source file.
In addition, this patch allows a specific image to be requested from the
command line by adding "cuImage.%" and "treeImage.%" targets to the list
of valid built targets in arch/powerpc/Makefile. This allows the default
dts selection to be overridden.
Another advantage to this change is it allows a single defconfig to be
supplied for all boards using the same chip family and only differing in
the device tree.
Important note: This patch adds two new zImage targets; zImage.dtb.% and
zImage.dtb.initrd.% for zImages with embedded dtb files. Currently
there are 5 platforms which require this: ps3, ep405, mpc885ads, ep88xc,
adder875-redboot and ep8248e. This patch *changes the zImage filenames*
for those platforms. ie. 'zImage.ps3' is now 'zImage.dtb.ps3'.
This new zImage.dtb targets were added so that the .dts file could be
part of the dependancies list for building them.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/boot/wrapper')
-rwxr-xr-x | arch/powerpc/boot/wrapper | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper index 763a0c46f441..c3178155311b 100755 --- a/arch/powerpc/boot/wrapper +++ b/arch/powerpc/boot/wrapper | |||
@@ -158,6 +158,29 @@ miboot|uboot) | |||
158 | cuboot*) | 158 | cuboot*) |
159 | binary=y | 159 | binary=y |
160 | gzip= | 160 | gzip= |
161 | case "$platform" in | ||
162 | *-mpc885ads|*-adder875*|*-ep88xc) | ||
163 | platformo=$object/cuboot-8xx.o | ||
164 | ;; | ||
165 | *5200*|*-motionpro) | ||
166 | platformo=$object/cuboot-52xx.o | ||
167 | ;; | ||
168 | *-pq2fads|*-ep8248e|*-mpc8272*|*-storcenter) | ||
169 | platformo=$object/cuboot-pq2.o | ||
170 | ;; | ||
171 | *-mpc824*) | ||
172 | platformo=$object/cuboot-824x.o | ||
173 | ;; | ||
174 | *-mpc83*) | ||
175 | platformo=$object/cuboot-83xx.o | ||
176 | ;; | ||
177 | *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555*) | ||
178 | platformo=$object/cuboot-85xx-cpm2.o | ||
179 | ;; | ||
180 | *-mpc85*) | ||
181 | platformo=$object/cuboot-85xx.o | ||
182 | ;; | ||
183 | esac | ||
161 | ;; | 184 | ;; |
162 | ps3) | 185 | ps3) |
163 | platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o" | 186 | platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o" |