Commit 5dec4da0 authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Remove debugging variable added to svn by mistake, (Thanks Pter)

parent 7213dae7

target/device/Atmel/Makefile.in

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ atmel_status: 
	@echo DOWNLOAD_LINUX26_VERSION=$(DOWNLOAD_LINUX26_VERSION)

	@echo LINUX_SOURCE=$(LINUX_SOURCE)

	@echo TARGETS=$(TARGETS)

	@echo ALLAN=$(ALLAN)





#TARGETS+=atmel_status

endif

target/device/Atmel/at91bootstrap/Config.in

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ config BR2_TARGET_AT91BOOTSTRAP 
	BR2_TARGET_AT91SAM9261EK || BR2_TARGET_AT91SAM9263EK || BR2_TARGET_AT91SAM9XEEK

	bool "Build AT91 Bootstrap for selected chip"



config BR2_TARGET_AT91BOOTSTRAP_BOARD

	string "Bootstrap board"

	default "$(BOARD_NAME)"

	depends on BR2_TARGET_AT91BOOTSTRAP

	help

	  This is used to do a make <board>_config



choice

	prompt "Boot Memory"

	default BR2_TARGET_AT91BOOT_DATAFLASHCARD

target/device/Atmel/at91bootstrap/at91bootstrap.mk

+20 −9
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
# at91bootstrap

#

#############################################################

AT91BOOTSTRAP_VERSION:=2.3

AT91BOOTSTRAP_PATCH_LEVEL:=4

AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_PATCH_LEVEL)

AT91BOOTSTRAP_VERSION:=2.9

AT91BOOTSTRAP_PATCH_LEVEL:=



AT91BOOTSTRAP_PATCHED_VERSION:=$(AT91BOOTSTRAP_VERSION)$(AT91BOOTSTRAP_PATCH_LEVEL)

AT91BOOTSTRAP_NAME:=at91bootstrap-$(AT91BOOTSTRAP_VERSION)

ATMEL_MIRROR:=$(strip $(subst ",, $(BR2_ATMEL_MIRROR)))

#"))
@@ -16,6 +17,9 @@ AT91BOOTSTRAP:=$(strip $(subst ",, $(BR2_AT91BOOTSTRAP))) 
#"))

AT91BOOTSTRAP_ZCAT:=$(BZCAT)



AT91BOOTSTRAP_BOARD:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_BOARD)))

#"))



AT91BOOTSTRAP_MEMORY:=$(strip $(subst ",, $(BR2_TARGET_AT91BOOTSTRAP_MEMORY)))

#"))
@@ -42,7 +46,7 @@ $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): 
$(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)

	mkdir -p $(PROJECT_BUILD_DIR)

	$(AT91BOOTSTRAP_ZCAT) $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap\*.patch

	toolchain/patch-kernel.sh $(AT91BOOTSTRAP_DIR) target/device/Atmel/at91bootstrap/ at91bootstrap-$(AT91BOOTSTRAP_VERSION)\*.patch

	touch $(AT91BOOTSTRAP_DIR)/.unpacked



$(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config
@@ -50,7 +54,7 @@ $(AT91BOOTSTRAP_DIR)/.configured: $(AT91BOOTSTRAP_DIR)/.unpacked .config 
		MEMORY=$(AT91BOOTSTRAP_MEMORY) \

		CROSS_COMPILE=$(TARGET_CROSS) \

		-C $(AT91BOOTSTRAP_DIR) \

		$(BOARD_NAME)_defconfig

		$(AT91BOOTSTRAP_BOARD)_defconfig

	touch $(AT91BOOTSTRAP_DIR)/.configured



$(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured
@@ -60,14 +64,21 @@ $(AT91BOOTSTRAP_TARGET): $(AT91BOOTSTRAP_DIR)/.configured 
		AT91_CUSTOM_FLAGS="$(AT91_CUSTOM_FLAGS)" \

		-C $(AT91BOOTSTRAP_DIR)



$(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY): $(AT91BOOTSTRAP_TARGET)

$(AT91BOOTSTRAP_DIR)/.installed: $(AT91BOOTSTRAP_TARGET)

	mkdir -p $(BINARIES_DIR)

	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)

	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)

	make MEMORY=$(AT91BOOTSTRAP_MEMORY) \

	     CROSS_COMPILE=$(TARGET_CROSS) \

	     -C $(AT91BOOTSTRAP_DIR) boot

	make DESTDIR=$(BINARIES_DIR) -C $(AT91BOOTSTRAP_DIR) install

	make DESTDIR=$(BR2_TARGET_ATMEL_COPYTO) -C $(AT91BOOTSTRAP_DIR) install

	touch $@



#	cp $(AT91BOOTSTRAP_TARGET) $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)

#	cp $(AT91BOOTSTRAP_TARGET) $(BR2_TARGET_ATMEL_COPYTO)/$(AT91BOOTSTRAP_BINARY)



.PHONY: at91bootstrap at91bootstrap-source



at91bootstrap: $(BINARIES_DIR)/$(AT91BOOTSTRAP_BINARY)

at91bootstrap: $(AT91BOOTSTRAP_DIR)/.installed



at91bootstrap-source: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE)

target/device/Atmel/at91rm9200df/at91rm9200df_defconfig

+207 −94

File changed.

Preview size limit exceeded, changes collapsed.

target/device/Atmel/at91sam9260dfc/Makefile.in

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,4 @@ endif 
ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),)

UBOOT_BOARD_NAME:=at91sam9260ek_nandflash

endif

ALLAN=1

else

ALLAN=2

endif