diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:10:52 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:10:52 +0200 |
| commit | 3a9a4a4d705c17c46dfeba2010ba285c2b5a9320 (patch) | |
| tree | 33da9a887060c116fe16854706490879d7a1e3a8 | |
| parent | cf6617c81c9f1ae3e2d8701b4f5effa192bc39df (diff) | |
| parent | 37f77bf6f205d401b6e653b338ff598736b9e881 (diff) | |
| download | barebox-3a9a4a4d705c17c46dfeba2010ba285c2b5a9320.tar.gz barebox-3a9a4a4d705c17c46dfeba2010ba285c2b5a9320.tar.xz | |
Merge branch 'for-next/make'
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | arch/arm/Makefile | 21 |
2 files changed, 23 insertions, 14 deletions
@@ -462,12 +462,18 @@ CFLAGS += $(call cc-option,-Wdeclaration-after-statement,) # disable pointer signed / unsigned warnings in gcc 4.0 CFLAGS += $(call cc-option,-Wno-pointer-sign,) -# Default kernel image to build when no specific target is given. -# KBUILD_IMAGE may be overruled on the command line or -# set in the environment -# Also any assignments in arch/$(ARCH)/Makefile take precedence over -# this default value +# KBUILD_IMAGE: Default barebox image to build +# Depending on the architecture, this can be either compressed or not. +# It will also include any necessary headers to be bootable. export KBUILD_IMAGE ?= barebox.bin +# KBUILD_BINARY: Raw barebox binary +# This variable is set in case the architecture prepends a header and +# points to a binary that can be loaded directly into RAM and executed. +export KBUILD_BINARY ?= barebox.bin +# KBUILD_IMAGE and _BINARY may be overruled on the command line or +# set in the environment. +# Also any assignments in arch/$(ARCH)/Makefile take precedence over +# the default value. barebox-flash-image: $(KBUILD_IMAGE) $(call if_changed,ln) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 14e4d6a162..97b373814e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -180,7 +180,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) @@ -188,7 +188,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 $@ @@ -200,17 +200,20 @@ MLO: $(KBUILD_BINARY) ifeq ($(CONFIG_OMAP_BUILD_IFT),y) KBUILD_TARGET := MLO -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := MLO endif -barebox.ubl: $(KBUILD_BINARY) - @echo " UBL " $@ - $(Q)scripts/mkublheader $< > barebox.ubl - $(Q)cat $< >> barebox.ubl +quiet_cmd_davinci_ubl_image = UBL-IMG $@ + cmd_davinci_ubl_image = set -e; \ + scripts/mkublheader $< > $@; \ + cat $< >> $@ + +barebox.ubl: $(KBUILD_BINARY) FORCE + $(call if_changed,davinci_ubl_image) ifeq ($(CONFIG_ARCH_DAVINCI),y) KBUILD_TARGET := barebox.ubl -KBUILD_BINARY := $(KBUILD_TARGET) +KBUILD_IMAGE := barebox.ubl endif pbl := arch/arm/pbl @@ -220,7 +223,7 @@ zbarebox.S zbarebox.bin zbarebox: barebox.bin archclean: $(MAKE) $(clean)=$(pbl) -KBUILD_IMAGE := $(KBUILD_BINARY) +KBUILD_IMAGE ?= $(KBUILD_BINARY) archprepare: maketools maketools: |