diff options
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 30eae87ead6d..361936a3d191 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -268,7 +268,12 @@ else | |||
268 | KBUILD_IMAGE := zImage | 268 | KBUILD_IMAGE := zImage |
269 | endif | 269 | endif |
270 | 270 | ||
271 | all: $(KBUILD_IMAGE) | 271 | # Build the DT binary blobs if we have OF configured |
272 | ifeq ($(CONFIG_USE_OF),y) | ||
273 | KBUILD_DTBS := dtbs | ||
274 | endif | ||
275 | |||
276 | all: $(KBUILD_IMAGE) $(KBUILD_DTBS) | ||
272 | 277 | ||
273 | boot := arch/arm/boot | 278 | boot := arch/arm/boot |
274 | 279 | ||
@@ -284,10 +289,10 @@ zImage Image xipImage bootpImage uImage: vmlinux | |||
284 | zinstall uinstall install: vmlinux | 289 | zinstall uinstall install: vmlinux |
285 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ | 290 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ |
286 | 291 | ||
287 | %.dtb: | 292 | %.dtb: scripts |
288 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ | 293 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ |
289 | 294 | ||
290 | dtbs: | 295 | dtbs: scripts |
291 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ | 296 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ |
292 | 297 | ||
293 | # We use MRPROPER_FILES and CLEAN_FILES now | 298 | # We use MRPROPER_FILES and CLEAN_FILES now |
@@ -306,7 +311,7 @@ define archhelp | |||
306 | echo ' uImage - U-Boot wrapped zImage' | 311 | echo ' uImage - U-Boot wrapped zImage' |
307 | echo ' bootpImage - Combined zImage and initial RAM disk' | 312 | echo ' bootpImage - Combined zImage and initial RAM disk' |
308 | echo ' (supply initrd image via make variable INITRD=<path>)' | 313 | echo ' (supply initrd image via make variable INITRD=<path>)' |
309 | echo ' dtbs - Build device tree blobs for enabled boards' | 314 | echo '* dtbs - Build device tree blobs for enabled boards' |
310 | echo ' install - Install uncompressed kernel' | 315 | echo ' install - Install uncompressed kernel' |
311 | echo ' zinstall - Install compressed kernel' | 316 | echo ' zinstall - Install compressed kernel' |
312 | echo ' uinstall - Install U-Boot wrapped compressed kernel' | 317 | echo ' uinstall - Install U-Boot wrapped compressed kernel' |