diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-12 16:09:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-12 16:16:44 +0200 |
| commit | b61544556474e8a39e1ecbe0b5d27a5fbca9b42d (patch) | |
| tree | 0ad6a294e81291edf1c9a7099156a9657b9e6055 | |
| parent | 8e724b3d3e1d8b272b261b586772c5415c47cb39 (diff) | |
| download | barebox-b61544556474e8a39e1ecbe0b5d27a5fbca9b42d.tar.gz barebox-b61544556474e8a39e1ecbe0b5d27a5fbca9b42d.tar.xz | |
Makefile: generate a barebox-flash-image link
Depending on the SoC a barebox.bin, barebox.netx, barebox.s5p, MLO image
is generated. With pbl support there now is an additional
arch/arm/pbl/zbarebox.bin image.
To help the user to determine which image should be flashed to his device,
generate a barebox-flash-image link.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/blackfin/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/Makefile | 5 |
5 files changed, 8 insertions, 18 deletions
@@ -437,12 +437,6 @@ else include/config/auto.conf: ; endif # $(dot-config) -# The all: target is the default when no target is given on the -# command line. -# This allow a user to issue only 'make' to build a kernel -# Defaults barebox but it is usually overridden in the arch makefile -all: barebox.bin - include $(srctree)/arch/$(ARCH)/Makefile ifdef CONFIG_DEBUG_INFO @@ -473,7 +467,12 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,) # set in the environment # Also any assignments in arch/$(ARCH)/Makefile take precedence over # this default value -export KBUILD_IMAGE ?= barebox +export KBUILD_IMAGE ?= barebox.bin + +barebox-flash-image: $(KBUILD_IMAGE) + $(call if_changed,ln) + +all: barebox-flash-image common-$(CONFIG_PBL_IMAGE) += pbl/ @@ -1009,7 +1008,7 @@ CLEAN_DIRS += $(MODVERDIR) CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \ .tmp_kallsyms* barebox_default_env* barebox.ldr \ - scripts/bareboxenv-target \ + scripts/bareboxenv-target barebox-flash-image \ Doxyfile.version barebox.srec barebox.s5p # Directories & files removed with 'make mrproper' diff --git a/arch/arm/Makefile b/arch/arm/Makefile index be4ef308bf..1362b3192b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -208,8 +208,6 @@ zbarebox.S zbarebox.bin zbarebox: barebox.bin archclean: $(MAKE) $(clean)=$(pbl) -all: $(KBUILD_IMAGE) - archprepare: maketools maketools: $(Q)$(MAKE) $(build)=arch/arm/tools include/generated/mach-types.h diff --git a/arch/blackfin/Makefile b/arch/blackfin/Makefile index a0b87f77d7..381c6a9f39 100644 --- a/arch/blackfin/Makefile +++ b/arch/blackfin/Makefile @@ -13,7 +13,7 @@ CFLAGS += -D__blackfin__ KALLSYMS += --symbol-prefix=_ ifndef CONFIG_BFIN_BOOT_BYPASS -all: barebox.ldr +KBUILD_IMAGE := barebox.ldr endif archprepare: maketools diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 6b7dae9faf..5e40de760f 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -82,8 +82,6 @@ incdir-y := $(machine-y) endif INCDIR := arch-$(incdir-y) -all: $(KBUILD_IMAGE) - ifneq ($(board-y),) BOARD := arch/mips/boards/$(board-y)/ else diff --git a/arch/x86/Makefile b/arch/x86/Makefile index db4180b32b..518b37fe2f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -14,11 +14,6 @@ CPPFLAGS += -fdata-sections -ffunction-sections LDFLAGS_uboot += -static --gc-sections endif -all: $(KBUILD_IMAGE) - - - - machdirs := $(patsubst %,arch/x86/mach-%/,$(machine-y)) ifeq ($(KBUILD_SRC),) |