diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-09-06 12:20:15 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-06 19:31:49 +0200 |
| commit | 606feec23625c1505c2ab28c084bccd23efdae36 (patch) | |
| tree | 5e7227a744388a81ea992ff1c54fed0f54148942 /arch/arm/Makefile | |
| parent | 25fc2ca049636274afcf65528ec07187d215cd27 (diff) | |
| download | barebox-606feec23625c1505c2ab28c084bccd23efdae36.tar.gz barebox-606feec23625c1505c2ab28c084bccd23efdae36.tar.xz | |
kbuild: keep the barebox binary accessible
When building a special image from the original (compressed or
not) binary, to not overwrite KBUILD_BINARY.
This allows producing multiple images (such as MLO, UBL, ...)
from the (z)barebox.bin. In the case where no special image is
used, KBUILD_IMAGE is set to KBUILD_BINARY.
This patch was developed together with Sascha Hauer. Thanks!
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8e660bea2b..94ee073c58 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -179,7 +179,7 @@ barebox.netx: $(KBUILD_BINARY) ifeq ($(machine-y),netx) KBUILD_TARGET := barebox.netx -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := barebox.netx endif barebox.s5p: $(KBUILD_BINARY) @@ -187,7 +187,7 @@ barebox.s5p: $(KBUILD_BINARY) ifeq ($(CONFIG_ARCH_S5PCxx),y) KBUILD_TARGET := barebox.s5p -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := barebox.s5p endif quiet_cmd_mlo ?= IFT $@ @@ -199,7 +199,7 @@ MLO: $(KBUILD_BINARY) ifeq ($(CONFIG_OMAP_BUILD_IFT),y) KBUILD_TARGET := MLO -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := MLO endif barebox.ubl: $(KBUILD_BINARY) @@ -209,7 +209,7 @@ barebox.ubl: $(KBUILD_BINARY) ifeq ($(CONFIG_ARCH_DAVINCI),y) KBUILD_TARGET := barebox.ubl -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := barebox.ubl endif pbl := arch/arm/pbl @@ -219,7 +219,7 @@ zbarebox.S zbarebox.bin zbarebox: barebox.bin archclean: $(MAKE) $(clean)=$(pbl) -KBUILD_IMAGE := $(KBUILD_BINARY) +KBUILD_IMAGE ?= $(KBUILD_BINARY) archprepare: maketools maketools: |