Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index dd4e1a3262525935189248897c3a212107d0e67d..eb7e0b2249af457f5f5332b1499f8418143aecb4 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
  *
@@ -16,7 +16,6 @@
 #define CONFIG_AT32AP7000
 #define CONFIG_ATNGW100MKII
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 
 /*
@@ -81,7 +80,6 @@
 #define CONFIG_BOOTCOMMAND                                             \
        "fsload 0x10400000 /uImage; bootm"
 
-#define CONFIG_BOOTDELAY               1
 
 /*
  * After booting the board for the first time, new ethernet addresses
@@ -99,25 +97,17 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_MII
-
 
 #define CONFIG_ATMEL_USART
 #define CONFIG_MACB
 #define CONFIG_PORTMUX_PIO
 #define CONFIG_SYS_NR_PIOS             5
 #define CONFIG_SYS_HSDRAMC
-#define CONFIG_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define CONFIG_GENERIC_MMC
 #define CONFIG_ATMEL_SPI
 
-
 #define CONFIG_SYS_DCACHE_LINESZ       32
 #define CONFIG_SYS_ICACHE_LINESZ       32