diff options
Diffstat (limited to 'target/device/Atmel')
| -rw-r--r-- | target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 3 | ||||
| -rw-r--r-- | target/device/Atmel/Makefile.in | 22 | ||||
| -rw-r--r-- | target/device/Atmel/arch-arm/u-boot/Makefile.in | 3 | ||||
| -rw-r--r-- | target/device/Atmel/at91bootstrap/at91bootstrap.mk | 18 |
4 files changed, 16 insertions, 30 deletions
diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index b3735bca9..c3dc857d4 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -5,8 +5,7 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) -# ")) +ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR) DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME) diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index 70d380586..bb0352985 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -3,10 +3,8 @@ ifeq ($(BR2_TARGET_ATMEL),y) ATMEL_PATH:=target/device/Atmel -BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) -#")) -BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) -#")) +BOARD_NAME:=$(call qstrip,$(BR2_BOARD_NAME)) +BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH)) ATMEL_TARGET:=$(ATMEL_PATH)/root TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton @@ -18,26 +16,23 @@ KERNEL_HEADERS_PATCH_DIR=target/device/Atmel/arch-avr32/kernel-headers-2.6.28.2 endif ifneq ($(COPYTO),) -TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_COPYTO))) +TARGET_ATMEL_COPYTO:=$(call qstrip,$(BR2_COPYTO)) else -TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) +TARGET_ATMEL_COPYTO:=$(call qstrip,$(BR2_TARGET_ATMEL_COPYTO)) endif # These are set by Config.in -DOWNLOAD_LINUX26_VERSION:= $(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) -#")) +DOWNLOAD_LINUX26_VERSION:= $(call qstrip,$(BR2_DOWNLOAD_LINUX26_VERSION)) ifeq ($(DOWNLOAD_LINUX26_VERSION),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) -#")) +LINUX26_VERSION:=$(call qstrip,$(BR2_LINUX26_VERSION)) ifeq ($(LINUX26_VERSION),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) -#")) +LINUX26_RC_PATCH:=$(call qstrip,$(BR2_LINUX26_RC_PATCH)) # These are set by "new" Config.in LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config @@ -62,8 +57,7 @@ DFB_BOARD_NAME:=$(BOARD_NAME) #BR2_PACKAGE_BUSYBOX_CONFIG:=$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config -U_BOOT_VERSION:=$(strip $(subst ",,$(BR2_UBOOT_VERSION))) -#")) +U_BOOT_VERSION:=$(call qstrip,$(BR2_UBOOT_VERSION)) # Update things in board specific makefiles include target/device/Atmel/*/Makefile.in diff --git a/target/device/Atmel/arch-arm/u-boot/Makefile.in b/target/device/Atmel/arch-arm/u-boot/Makefile.in index 841895c59..b5981e176 100644 --- a/target/device/Atmel/arch-arm/u-boot/Makefile.in +++ b/target/device/Atmel/arch-arm/u-boot/Makefile.in @@ -1,5 +1,4 @@ ifneq ($(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR),) -U_BOOT_ARCH_PATCH_DIR:=$(strip $(subst ",, $(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR))) -#")) +U_BOOT_ARCH_PATCH_DIR:=$(call qstrip,$(BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR)) endif diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index b68be5e40..92da683da 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -7,29 +7,23 @@ AT91BOOTSTRAP_VERSION:=2.10 AT91BOOTSTRAP_PATCH_LEVEL:= AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL) AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) -#")) +ATMEL_MIRROR:=$(call qstrip,$(BR2_ATMEL_MIRROR)) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR) AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME) -AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) -#")) +AT91BOOTSTRAP:=$(call qstrip,$(BR2_AT91BOOTSTRAP)) AT91BOOTSTRAP_ZCAT:=$(BZCAT) -AT91BOOTSTRAP_BOARD:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_BOARD))) -#")) +AT91BOOTSTRAP_BOARD:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_BOARD)) -AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) -#")) +AT91BOOTSTRAP_MEMORY:=$(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP_MEMORY)) AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_PATCHED_VERSION).bin AT91BOOTSTRAP_TARGET:=$(AT91BOOTSTRAP_DIR)/binaries/$(AT91BOOTSTRAP_BINARY) -AT91BOOTSTRAP_JUMP_ADDR:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR))) -#")) -AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE))) -#")) +AT91BOOTSTRAP_JUMP_ADDR:=$(call qstrip,$(BR2_AT91BOOTSTRAP_JUMP_ADDR)) +AT91BOOTSTRAP_IMG_SIZE:=$(call qstrip,$(BR2_AT91BOOTSTRAP_IMG_SIZE)) AT91_CUSTOM_FLAGS:= ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),) |