diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-07-07 11:38:44 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-07-07 11:38:44 +0200 |
| commit | 6f43ba70d15e15a08c25b3d956c70addb6740737 (patch) | |
| tree | e5ddc8498043c0c47559737ea60e4d7fc866e20a /include/configs/atngw100.h | |
| parent | 003b09dad492ebc385b28067b8028a0c0ff9323f (diff) | |
| parent | 9c6b05cb724e18d1db3f9e1a75b2272572f06fbd (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/atngw100.h')
| -rw-r--r-- | include/configs/atngw100.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index 540e86ae478..1cab0a92c2a 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -14,6 +14,9 @@ #define CONFIG_AT32AP7000 #define CONFIG_ATNGW100 +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_EARLY_INIT_R + /* * Set up the PLL to run at 140 MHz, the CPU to run at the PLL * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency @@ -59,17 +62,7 @@ #define CONFIG_BOOTCOMMAND \ "fsload; bootm" -/* - * Only interrupt autoboot if <space> is pressed. Otherwise, garbage - * data on the serial line may interrupt the boot sequence. - */ #define CONFIG_BOOTDELAY 1 -#define CONFIG_AUTOBOOT -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Press SPACE to abort autoboot in %d seconds\n", bootdelay -#define CONFIG_AUTOBOOT_DELAY_STR "d" -#define CONFIG_AUTOBOOT_STOP_STR " " /* * After booting the board for the first time, new ethernet addresses @@ -87,8 +80,6 @@ /* * Command line configuration. */ -#include <config_cmd_default.h> - #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP #define CONFIG_CMD_EXT2 @@ -98,10 +89,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SETGETDCR -#undef CONFIG_CMD_SOURCE -#undef CONFIG_CMD_XIMG #define CONFIG_ATMEL_USART #define CONFIG_MACB @@ -113,7 +100,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 |