summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-12-10 16:14:02 +0800
committerAndreas Bießmann <andreas.devel@googlemail.com>2013-12-17 17:21:18 +0100
commitd51a2a2d63d83207b56a7aef7a191d081058d6ae (patch)
tree4e01f94fad3ed1e57d3d2640139397110edc6814
parent1ae37be7822858dead80c53ffa65733948ecda32 (diff)
downloadu-boot-imx-d51a2a2d63d83207b56a7aef7a191d081058d6ae.zip
u-boot-imx-d51a2a2d63d83207b56a7aef7a191d081058d6ae.tar.gz
u-boot-imx-d51a2a2d63d83207b56a7aef7a191d081058d6ae.tar.bz2
arm: atmel: at91sam9x5: move CONFIG_SYS_NO_FLASH to proper position
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>
-rw-r--r--include/configs/at91sam9x5ek.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
index 4eeaf3b..f0a6757 100644
--- a/include/configs/at91sam9x5ek.h
+++ b/include/configs/at91sam9x5ek.h
@@ -61,14 +61,15 @@
#define CONFIG_BOOTP_GATEWAY
#define CONFIG_BOOTP_HOSTNAME
+/* no NOR flash */
+#define CONFIG_SYS_NO_FLASH
+
/*
* Command line configuration.
*/
#include <config_cmd_default.h>
#undef CONFIG_CMD_FPGA
#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_LOADS
#define CONFIG_CMD_PING
#define CONFIG_CMD_DHCP
@@ -100,9 +101,6 @@
#define CONFIG_SF_DEFAULT_SPEED 30000000
#endif
-/* no NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
/* NAND flash */
#ifdef CONFIG_CMD_NAND
#define CONFIG_NAND_ATMEL