Merge branch 'master' of git://git.denx.de/u-boot-tegra

[people/ms/u-boot.git] / include / configs / atngw100mkii.h

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index 486d9ee63c4f8b84caccafa2fb1c70995a5ff9ba..4d9282a7bf86ecf414833b326b94074713d1bd29 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2006 Atmel Corporation
  *
- * Copyright (C) 2012 Andreas Bießmann <andreas.devel@googlemail.com>
+ * Copyright (C) 2012 Andreas Bießmann <andreas@biessmann.org>
  *
  * Configuration settings for the AVR32 Network Gateway
  *
@@ -81,7 +81,6 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload 0x10400000 /uImage; bootm"
 
-#define CONFIG_BOOTDELAY               1
 
 /*
  * After booting the board for the first time, new ethernet addresses
@@ -99,16 +98,7 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_SF
-#define CONFIG_CMD_SPI
-#define CONFIG_CMD_MII
-
 
 #define CONFIG_ATMEL_USART
 #define CONFIG_MACB
@@ -120,8 +110,6 @@
 #define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
-#define CONFIG_SPI_FLASH_ATMEL
-
 #define CONFIG_SYS_DCACHE_LINESZ       32
 #define CONFIG_SYS_ICACHE_LINESZ       32
 
@@ -156,7 +144,6 @@
 #define CONFIG_SYS_BOOTPARAMS_LEN      (16 * 1024)
 
 /* Other configuration settings that shouldn't have to change all that often */
-#define CONFIG_SYS_PROMPT              "U-Boot> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)