diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2013-10-21 18:16:59 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-10-05 10:29:38 +0200 |
| commit | fbef5b298f6eba37d80f1ac7cde3c0ee55a28bcc (patch) | |
| tree | e7f13403bd2ab73a0769890a0d1024ae0735c173 /arch | |
| parent | 5155c78e002c2c1fe7f8a4abc4c1c26a927fcdbe (diff) | |
| download | linux-fbef5b298f6eba37d80f1ac7cde3c0ee55a28bcc.tar.gz linux-fbef5b298f6eba37d80f1ac7cde3c0ee55a28bcc.tar.xz | |
ARM: make mach-xyz/Makefile.boot optional for !ARCH_MULTIPLATFORM
Makefile.boot is supposed to define zreladdr-y, params_phys-y and
initrd_phys-y. The first one is only needed in the absence of AUTO_ZRELADDR
and when building a zImage. The latters are only needed for bootp stuff.
So ignore errors on including Makefile.boot and error out in the targets
that need the corresponding settings.
This makes it unnecessary to create dummy Makefile.boot files.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/Makefile | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index ec2f8065f955..37e87d417d99 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -12,7 +12,7 @@ # ifneq ($(MACHINE),) -include $(srctree)/$(MACHINE)/Makefile.boot +sinclude $(srctree)/$(MACHINE)/Makefile.boot endif # Note: the following conditions must always be true: @@ -51,10 +51,19 @@ $(obj)/Image: vmlinux FORCE $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ +ifneq ($(CONFIG_AUTO_ZRELADDR)$(ZRELADDR),) + $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) @$(kecho) ' Kernel: $@ is ready' +else + +$(obj)/zImage: FORCE + @echo 'Either enable CONFIG_AUTO_ZRELADDR or provide zreladdr-y in Makefile.boot' + @false + +endif endif ifneq ($(LOADADDR),) @@ -81,6 +90,8 @@ $(obj)/uImage: $(obj)/zImage FORCE @$(kecho) ' Image $@ is ready' $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE + @test -n "$(PARAMS_PHYS)" || \ + (echo This machine does not support BOOTP; exit -1) $(Q)$(MAKE) $(build)=$(obj)/bootp $@ @: |