summaryrefslogtreecommitdiff
path: root/target/device/Atmel/at91sam9260dfc
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-03 00:07:25 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-03 00:07:25 +0000
commit5dec4da010cb151d314d9d220383b7c3585726f7 (patch)
tree7934101a58c2c1864234545ed2cd3cc6d36d9fbe /target/device/Atmel/at91sam9260dfc
parent7213dae7a5009ba966f261e04b50c49a0672cea3 (diff)
Remove debugging variable added to svn by mistake, (Thanks Pter)
Diffstat (limited to 'target/device/Atmel/at91sam9260dfc')
-rw-r--r--target/device/Atmel/at91sam9260dfc/Makefile.in4
-rw-r--r--target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig31
2 files changed, 24 insertions, 11 deletions
diff --git a/target/device/Atmel/at91sam9260dfc/Makefile.in b/target/device/Atmel/at91sam9260dfc/Makefile.in
index 50b8e3ca5..1bf01ae10 100644
--- a/target/device/Atmel/at91sam9260dfc/Makefile.in
+++ b/target/device/Atmel/at91sam9260dfc/Makefile.in
@@ -13,8 +13,4 @@ endif
ifneq ($(BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH),)
UBOOT_BOARD_NAME:=at91sam9260ek_nandflash
endif
-ALLAN=1
-else
-ALLAN=2
-endif
diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
index 40dd7c58c..1ecba6adc 100644
--- a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
+++ b/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Jan 2 08:27:02 2009
+# Fri Jan 2 15:56:47 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -121,13 +121,9 @@ BR2_TARGET_AT91_ADVANCED_INFO=y
BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6"
BR2_TARGET_ATMEL_COPYTO="/tftpboot"
BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_AT91=y
-BR2_TARGET_UBOOT_SERVERIP_AT91="10.175.196.221"
-BR2_TARGET_UBOOT_IPADDR_AT91="10.175.196.18"
-BR2_TARGET_UBOOT_GATEWAY_AT91="10.175.196.1"
-BR2_TARGET_UBOOT_NETMASK_AT91="255.255.255.0"
-BR2_TARGET_UBOOT_ETHADDR_AT91="04:25:fe:ed:00:18"
+# BR2_TARGET_UBOOT_AT91 is not set
BR2_TARGET_AT91BOOTSTRAP=y
+BR2_TARGET_AT91BOOTSTRAP_BOARD="at91sam9260ek"
# BR2_TARGET_AT91BOOT_DATAFLASH is not set
BR2_TARGET_AT91BOOT_DATAFLASHCARD=y
# BR2_TARGET_AT91BOOT_NANDFLASH is not set
@@ -840,6 +836,27 @@ BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot"
#
# bootloader for target device
#
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_2009_01_RC1=y
+# BR2_TARGET_UBOOT_2008_10 is not set
+# BR2_TARGET_UBOOT_1_3_4 is not set
+# BR2_TARGET_UBOOT_2009_01 is not set
+BR2_UBOOT_VERSION="2009.01-rc1"
+BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
+BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
+BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
+BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
+BR2_TARGET_UBOOT_GATEWAY="10.175.196.1"
+BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
+BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
+# BR2_TARGET_UBOOT_SILENT is not set
+# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
+# BR2_TARGET_UBOOT_TOOL_ENV is not set
+BR2_BOOTSOURCE_DATAFLASHCARD=y
+BR2_BOOTSOURCE_DATAFLASH=y
+BR2_BOOTSOURCE=y
#
# Kernel