colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: atmel: at91sam9x5: move CONFIG_SYS_NO_FLASH to proper position

Browse Source 
In config_cmd_default.h, it will use CONFIG_SYS_NO_FLASH to decide
whether include CONFIG_CMD_FLASH and CONFIG_CMD_IMLS. So, move the
CONFIG_SYS_NO_FLASH to proper position, then we don't need to undef
these two commands.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Bo Shen
2013-12-10 16:14:02 +08:00
committed by Andreas Bießmann
parent 1ae37be782
commit d51a2a2d63
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/configs/at91sam9x5ek.h
View File

@@ -61,14 +61,15 @@
#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME #define CONFIG_BOOTP_HOSTNAME
/* no NOR flash */
#define CONFIG_SYS_NO_FLASH
/* /*
* Command line configuration. * Command line configuration.
*/ */
#include <config_cmd_default.h> #include <config_cmd_default.h>
#undef CONFIG_CMD_FPGA #undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_IMI #undef CONFIG_CMD_IMI
#undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_LOADS
#define CONFIG_CMD_PING #define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP #define CONFIG_CMD_DHCP
@@ -100,9 +101,6 @@
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000
#endif #endif
/* no NOR flash */
#define CONFIG_SYS_NO_FLASH
/* NAND flash */ /* NAND flash */
#ifdef CONFIG_CMD_NAND #ifdef CONFIG_CMD_NAND
#define CONFIG_NAND_ATMEL #define CONFIG_NAND_ATMEL