2
1
Эх сурвалжийг харах

bzcat => $(BZCAT) for u-boot and at91bootstrap

Ulf Samuelsson 18 жил өмнө
parent
commit
66285ef7d8

+ 5 - 3
target/device/Atmel/at91bootstrap/at91bootstrap.mk

@@ -14,7 +14,7 @@ AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2
 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME)
 AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP)))
 AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP)))
 #"))
 #"))
-AT91BOOTSTRAP_ZCAT:=bzcat
+AT91BOOTSTRAP_ZCAT:=$(BZCAT)
 
 
 AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY)))
 AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY)))
 #"))
 #"))
@@ -24,7 +24,9 @@ AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
 AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY)
 
 
 AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR)))
 AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR)))
+#"))
 AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE)))
 AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE)))
+#"))
 
 
 AT91_CUSTOM_FLAGS:=
 AT91_CUSTOM_FLAGS:=
 ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),)
 ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),)
@@ -43,8 +45,6 @@ $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
 	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap\*.patch
 	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap\*.patch
 	touch $(AT91BOOTSTRAP_DIR)/.unpacked
 	touch $(AT91BOOTSTRAP_DIR)/.unpacked
 
 
-atbu: $(AT91BOOTSTRAP_DIR)/.unpacked
-
 $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
 $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
 	$(MAKE) \
 	$(MAKE) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
 		MEMORY=$(AT91BOOTSTRAP_MEMORY) \
@@ -71,6 +71,8 @@ at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)
 
 
 at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
 at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)
 
 
+at91bootstrap-unpacked: $(AT91BOOTSTRAP_DIR)/.unpacked
+
 .PHONY: at91bootstrap-clean at91bootstrap-dirclean
 .PHONY: at91bootstrap-clean at91bootstrap-dirclean
 
 
 at91bootstrap-clean:
 at91bootstrap-clean:

+ 1 - 1
target/device/Atmel/u-boot/u-boot.mk

@@ -17,7 +17,7 @@ UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2
 #UBOOT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/u-boot
 #UBOOT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/u-boot
 UBOOT_SITE:=$(ATMEL_MIRROR)/Source
 UBOOT_SITE:=$(ATMEL_MIRROR)/Source
 UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)/Source
 UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)/Source
-UBOOT_CAT:=bzcat
+UBOOT_CAT:=$(BZCAT)
 UBOOT_PATCH_SOURCE:=u-boot-1.2.0-atmel-patch.tar.bz2
 UBOOT_PATCH_SOURCE:=u-boot-1.2.0-atmel-patch.tar.bz2
 
 
 MKIMAGE_BINLOC:=$(UBOOT_BUILD_DIR)/tools/mkimage
 MKIMAGE_BINLOC:=$(UBOOT_BUILD_DIR)/tools/mkimage