From 6547bced933fface8e0f0dde08f0e0fe1777ddf9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 22 Aug 2007 12:35:41 +0000 Subject: - global whitespace trimming --- target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 2 +- target/device/Atmel/Makefile.in | 14 ++++---- target/device/Atmel/at91bootstrap/at91bootstrap.mk | 28 +++++++-------- target/device/Atmel/u-boot/u-boot.mk | 42 +++++++++++----------- 4 files changed, 43 insertions(+), 43 deletions(-) (limited to 'target/device/Atmel') diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index 35fa7c343..716e147b8 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -5,7 +5,7 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source DATAFLASHBOOT_SOURCE:=$(DATAFLASHBOOT_NAME).tar.bz2 diff --git a/target/device/Atmel/Makefile.in b/target/device/Atmel/Makefile.in index e920be933..728c51c9e 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -3,9 +3,9 @@ ifeq ($(strip $(BR2_TARGET_ATMEL)),y) ATMEL_PATH:=target/device/Atmel -BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) +BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) #")) -BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) +BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) #")) ATMEL_TARGET:=$(ATMEL_PATH)/root @@ -13,24 +13,24 @@ TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton TARGET_DEVICE_TABLE:=$(ATMEL_TARGET)/device_table.txt TARGET_SKELETON_LINKS:=$(ATMEL_TARGET)/skel.tar.gz -TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) +TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) # These are set by Config.in -DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) #")) ifeq ($(DOWNLOAD_LINUX26_VERSION),) DOWNLOAD_LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) #")) ifeq ($(LINUX26_VERSION),) LINUX26_VERSION=$(LINUX_HEADERS_VERSION) endif -LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) #")) -LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) #")) # These are set by "new" Config.in diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index ee1212244..5faef4175 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -7,31 +7,31 @@ AT91BOOTSTRAP_VERSION:=2.3 AT91BOOTSTRAP_PATCH_LEVEL:=2 AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_PATCH_LEVEL) AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) AT91BOOTSTRAP_SITE:=$(ATMEL_MIRROR)/Source AT91BOOTSTRAP_SOURCE:=$(AT91BOOTSTRAP_NAME).tar.bz2 AT91BOOTSTRAP_DIR:=$(PROJECT_BUILD_DIR)/$(AT91BOOTSTRAP_NAME) -AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) +AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) #")) AT91BOOTSTRAP_ZCAT:=bzcat -AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) +AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(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:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_JUMP_ADDR))) +AT91BOOTSTRAP_IMG_SIZE:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP_IMG_SIZE))) AT91_CUSTOM_FLAGS:= ifneq ($(AT91BOOTSTRAP_JUMP_ADDR),) -AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) +AT91_CUSTOM_FLAGS+=-DJUMP_ADDR=$(AT91BOOTSTRAP_JUMP_ADDR) endif ifneq ($(AT91BOOTSTRAP_IMG_SIZE),) -AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) +AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) endif $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): @@ -47,16 +47,16 @@ atbu: $(AT91BOOTSTRAP_DIR)/.unpacked $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - -C $(AT91BOOTSTRAP_DIR) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + -C $(AT91BOOTSTRAP_DIR) \ $(BOARD_NAME)_defconfig touch $(AT91BOOTSTRAP_DIR)/.configured $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured $(MAKE) \ - MEMORY=$(AT91BOOTSTRAP_MEMORY) \ - CROSS_COMPILE=$(TARGET_CROSS) \ + MEMORY=$(AT91BOOTSTRAP_MEMORY) \ + CROSS_COMPILE=$(TARGET_CROSS) \ AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \ -C $(AT91BOOTSTRAP_DIR) @@ -65,13 +65,13 @@ $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET) cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) cp $(AT91BOOTSTRAP_TARGET) /tftpboot/$(AT91BOOTSTRAP_BINARY) -.PHONY: at91bootstrap at91bootstrap-source +.PHONY: at91bootstrap at91bootstrap-source at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY) at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) -.PHONY: at91bootstrap-clean at91bootstrap-dirclean +.PHONY: at91bootstrap-clean at91bootstrap-dirclean at91bootstrap-clean: make -C $(AT91BOOTSTRAP_DIR) clean diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index 35b9f2166..5bd1ce278 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -1,14 +1,14 @@ ############################################################# # # u-boot mkimage to build to target u-boot filesystems and -# -# u-boot.bin - the boot loader for the target - which needs soft float, so -# we won't make it. +# +# u-boot.bin - the boot loader for the target - which needs soft float, so +# we won't make it. # # ############################################################# UBOOT_VERSION:=1.2.0-atmel -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #")) UBOOT_DIR:=$(BUILD_DIR)/u-boot-$(UBOOT_VERSION) UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION) @@ -30,15 +30,15 @@ UBOOT_PATCHES:=$(PROJECT_BUILD_DIR)/u-boot-patches UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp UBOOT_SCR=$(BINARIES_DIR)/autoscript -TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) +TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) #")) -TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) +TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) #")) -TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) +TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) #")) -TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) +TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) #")) -TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) +TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) #")) UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h @@ -61,9 +61,9 @@ $(UBOOT_PATCHES)/.unpacked: $(DL_DIR)/$(UBOOT_PATCH_SOURCE) $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE): $(UBOOT_DIR)/.unpacked $(UBOOT_PATCHES)/.unpacked toolchain/patch-kernel.sh $(UBOOT_DIR) $(UBOOT_PATCHES) *.patch touch $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE) -# cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/. -# cp $(UBOOT_PATCHES)/cmd_defenv.c $(UBOOT_DIR)/common/. -# cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/. +# cp $(UBOOT_CONFIG_FILE) $(UBOOT_DIR)/include/configs/. +# cp $(UBOOT_PATCHES)/cmd_defenv.c $(UBOOT_DIR)/common/. +# cp $(UBOOT_ATMEL_BMP) $(UBOOT_DIR)/tools/logos/. $(UBOOT_BUILD_DIR)/.configured: $(UBOOT_DIR)/.patched.$(UBOOT_PATCH_SOURCE) ifneq ($(strip $(UBOOT_CONFIG_FILE)),) @@ -76,7 +76,7 @@ endif $(UBOOT_CONFIG) $(SED) 's/ $$(SREC) $$(BIN)//' $(UBOOT_DIR)/examples/Makefile touch $(UBOOT_BUILD_DIR)/.configured -# $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) +# $(MAKE) O=$(UBOOT_BUILD_DIR) -C $(UBOOT_DIR) $(MKIMAGE_BINLOC): $(UBOOT_BUILD_DIR)/.configured $(MAKE) \ @@ -167,17 +167,17 @@ endif $(UBOOT_SCR).$(PROJECT): $(UBOOT_SCR) $(MKIMAGE) $(MKIMAGE) -A arm \ - -O linux \ - -T script \ - -C none \ - -a 0 \ - -e 0 \ + -O linux \ + -T script \ + -C none \ + -a 0 \ + -e 0 \ -n "autoscr config" \ - -d $(UBOOT_SCR) \ + -d $(UBOOT_SCR) \ $(UBOOT_SCR).$(PROJECT) cp $(UBOOT_SCR).$(PROJECT) /tftpboot -$(MKIMAGE): $(MKIMAGE_BINLOC) +$(MKIMAGE): $(MKIMAGE_BINLOC) cp -f $(MKIMAGE_BINLOC) $(MKIMAGE) uboot: $(MKIMAGE) uboot-bin $(UBOOT_SCR).$(PROJECT) @@ -191,7 +191,7 @@ uboot-clean: rm -fr $(UBOOT_DIR) rm -f $(UBOOT_SCR) rm -f $(UBOOT_SCR).$(PROJECT) -# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean +# -$(MAKE) -C $(UBOOT_DIR)/uboot-tools clean uboot-dirclean: uboot-clean rm -rf $(UBOOT_DIR) -- cgit v1.2.3