From a035d2300a93e85d98c9e81315adcbd2f89b6be4 Mon Sep 17 00:00:00 2001 From: Ulf Samuelsson Date: Sun, 22 Jul 2007 17:04:11 +0000 Subject: Use a single ATMEL_MIRROR declaration + cleanup --- target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 1 - target/device/Atmel/Makefile.in | 9 +++++++++ target/device/Atmel/at91bootstrap/at91bootstrap.mk | 4 ++-- target/device/Atmel/u-boot/u-boot.mk | 6 +++++- 4 files changed, 16 insertions(+), 4 deletions(-) (limited to 'target/device') diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index b0c5fff6e..44bb8b0aa 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -5,7 +5,6 @@ ############################################################# DATAFLASHBOOT_VERSION:=1.05 DATAFLASHBOOT_NAME:=DataflashBoot-$(DATAFLASHBOOT_VERSION) -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) DATAFLASHBOOT_SITE:=$(ATMEL_MIRROR)/Source 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 96e45b431..d42020f98 100644 --- a/target/device/Atmel/Makefile.in +++ b/target/device/Atmel/Makefile.in @@ -1,9 +1,14 @@ # ******************************************************************* +ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) +#")) + ifeq ($(strip $(BR2_TARGET_ATMEL)),y) ATMEL_PATH:=target/device/Atmel BOARD_NAME:=$(strip $(subst ",, $(BR2_BOARD_NAME))) +#")) BOARD_PATH:=$(strip $(subst ",, $(BR2_BOARD_PATH))) +#")) ATMEL_TARGET:=$(ATMEL_PATH)/root TARGET_SKELETON:=$(ATMEL_TARGET)/target_skeleton @@ -14,9 +19,13 @@ TARGET_ATMEL_COPYTO:=$(strip $(subst ",, $(BR2_TARGET_ATMEL_COPYTO))) # These are set by Config.in DOWNLOAD_LINUX26_VERSION:=$(strip $(subst ",, $(BR2_DOWNLOAD_LINUX26_VERSION))) +#")) LINUX26_VERSION:=$(strip $(subst ",, $(BR2_LINUX26_VERSION))) +#")) LINUX26_RC_PATCH:=$(strip $(subst ",, $(BR2_LINUX26_RC_PATCH))) +#")) LINUX_BSP_PATCH:=$(strip $(subst ",, $(BR2_LINUX_BSP_ATMEL_PATCH))) +#")) # These are set by "new" Config.in LINUX26_KCONFIG:=$(BOARD_PATH)/$(BOARD_NAME)-linux-$(LINUX26_VERSION).config diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index ccf1bb716..e5bfa38bb 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -5,15 +5,15 @@ ############################################################# AT91BOOTSTRAP_VERSION:=2.3 AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION) -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_ZCAT:=bzcat AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY))) - +#")) AT91BOOTSTRAP_BINARY:=$(BOARD_NAME)-$(AT91BOOTSTRAP_MEMORY)boot-$(AT91BOOTSTRAP_VERSION).bin diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index c8e86016c..40d7ed891 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -12,7 +12,6 @@ UBOOT_DIR:=$(BUILD_DIR)/u-boot-$(UBOOT_VERSION) UBOOT_BUILD_DIR:=$(PROJECT_BUILD_DIR)/u-boot-$(UBOOT_VERSION) UBOOT_SOURCE:=u-boot-$(UBOOT_VERSION).tar.bz2 #UBOOT_SOURCE:=u-boot-1.1.5-atmel.tar.bz2 -ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR))) #UBOOT_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/u-boot UBOOT_SITE:=$(ATMEL_MIRROR)/Source UBOOT_PATCH_SITE:=$(ATMEL_MIRROR)/Source @@ -30,10 +29,15 @@ UBOOT_ATMEL_BMP:=$(UBOOT_PATCHES)/atmel.bmp UBOOT_SCR=$(BINARIES_DIR)/autoscript TARGET_UBOOT_IPADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_IPADDR))) +#")) TARGET_UBOOT_SERVERIP:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_SERVERIP))) +#")) TARGET_UBOOT_GATEWAY:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_GATEWAY))) +#")) TARGET_UBOOT_NETMASK:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_NETMASK))) +#")) TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR))) +#")) UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h $(DL_DIR)/$(UBOOT_SOURCE): -- cgit v1.2.3