summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-07-05 19:53:59 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-07-10 11:57:48 (GMT)
commit1ff88054a84f1fd6a28465aad4e6bed241e431d9 (patch)
treeb6df9c295a590f85ae4904d98157590b08f176da
parentc94224930cbb2dd4377f9c0a061828fcc637b0e4 (diff)
downloadbuildroot-1ff88054a84f1fd6a28465aad4e6bed241e431d9.tar.gz
buildroot-1ff88054a84f1fd6a28465aad4e6bed241e431d9.tar.bz2
barebox: convert to GENTARGETS
[Peter: add ':=' -> '=' change] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--boot/barebox/barebox.mk68
1 files changed, 32 insertions, 36 deletions
diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk
index f3e769f..34ec5da 100644
--- a/boot/barebox/barebox.mk
+++ b/boot/barebox/barebox.mk
@@ -4,12 +4,16 @@
#
#############################################################
-BAREBOX_VERSION:=2011.05.0
-BAREBOX_SOURCE:=barebox-$(BAREBOX_VERSION).tar.bz2
-BAREBOX_SITE:=http://www.barebox.org/download/
-BAREBOX_DIR:=$(BUILD_DIR)/barebox-$(BAREBOX_VERSION)
-BAREBOX_CAT:=$(BZCAT)
-BAREBOX_BOARD_DEFCONFIG:=$(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
+BAREBOX_VERSION = 2011.05.0
+BAREBOX_SOURCE = barebox-$(BAREBOX_VERSION).tar.bz2
+BAREBOX_SITE = http://www.barebox.org/download/
+
+BAREBOX_INSTALL_IMAGES = YES
+ifneq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+BAREBOX_INSTALL_TARGET = NO
+endif
+
+BAREBOX_BOARD_DEFCONFIG = $(call qstrip,$(BR2_TARGET_BAREBOX_BOARD_DEFCONFIG))
ifeq ($(KERNEL_ARCH),i386)
BAREBOX_ARCH=x86
@@ -21,41 +25,33 @@ endif
BAREBOX_MAKE_FLAGS = ARCH=$(BAREBOX_ARCH) CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)"
-$(DL_DIR)/$(BAREBOX_SOURCE):
- $(call DOWNLOAD,$(BAREBOX_SITE),$(BAREBOX_SOURCE))
-
-$(BAREBOX_DIR)/.unpacked: $(DL_DIR)/$(BAREBOX_SOURCE)
- mkdir -p $(@D)
- $(INFLATE$(suffix $(BAREBOX_SOURCE))) $(DL_DIR)/$(BAREBOX_SOURCE) \
- | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
- touch $@
+define BAREBOX_CONFIGURE_CMDS
+ $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
+endef
-$(BAREBOX_DIR)/.patched: $(BAREBOX_DIR)/.unpacked
- toolchain/patch-kernel.sh $(BAREBOX_DIR) boot/barebox \
- barebox-$(BAREBOX_VERSION)-\*.patch \
- barebox-$(BAREBOX_VERSION)-\*.patch.$(ARCH)
- touch $@
-
-$(BAREBOX_DIR)/.configured: $(BAREBOX_DIR)/.patched
- $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR) $(BAREBOX_BOARD_DEFCONFIG)_defconfig
- touch $@
+ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+define BAREBOX_BUILD_BAREBOXENV_CMDS
+ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $(@D)/bareboxenv \
+ $(@D)/scripts/bareboxenv.c
+endef
+endif
-$(BAREBOX_DIR)/.built: $(BAREBOX_DIR)/.configured
- $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(BAREBOX_DIR)
- touch $@
+define BAREBOX_BUILD_CMDS
+ $(BAREBOX_BUILD_BAREBOXENV_CMDS)
+ $(MAKE) $(BAREBOX_MAKE_FLAGS) -C $(@D)
+endef
-$(BAREBOX_DIR)/.installed: $(BAREBOX_DIR)/.built
- cp $(BAREBOX_DIR)/barebox.bin $(BINARIES_DIR)
- touch $@
+define BAREBOX_INSTALL_IMAGES_CMDS
+ cp $(@D)/barebox.bin $(BINARIES_DIR)
+endef
-# bareboxenv for the target
-$(TARGET_DIR)/usr/bin/bareboxenv: $(BAREBOX_DIR)/.configured
- mkdir -p $(@D)
- $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $@ \
- $(BAREBOX_DIR)/scripts/bareboxenv.c
+ifeq ($(BR2_TARGET_BAREBOX_BAREBOXENV),y)
+define BAREBOX_INSTALL_TARGET_CMDS
+ cp $(@D)/bareboxenv $(TARGET_DIR)/usr/bin
+endef
+endif
-barebox: $(BAREBOX_DIR)/.installed \
- $(if $(BR2_TARGET_BAREBOX_BAREBOXENV),$(TARGET_DIR)/usr/bin/bareboxenv)
+$(eval $(call GENTARGETS,boot,barebox))
ifeq ($(BR2_TARGET_BAREBOX),y)
TARGETS+=barebox