summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-11-20 11:17:16 +0800
committerAndreas Bießmann <andreas.devel@googlemail.com>2013-12-01 22:38:53 +0100
commit782358fb7628bd97aa9e14ee91a171686fbf631a (patch)
tree847ce84e1bfe03f791e1525c7e60179ba3d1677a /include
parent4535a24c0c06e367bc40c43b4807bdb335513a1a (diff)
downloadu-boot-imx-782358fb7628bd97aa9e14ee91a171686fbf631a.zip
u-boot-imx-782358fb7628bd97aa9e14ee91a171686fbf631a.tar.gz
u-boot-imx-782358fb7628bd97aa9e14ee91a171686fbf631a.tar.bz2
arm: atmel: sam9m10g45ek: let CONFIG_SYS_NO_FLASH at 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, if the CONFIG_SYS_NO_FLASH defined later than include/config_cmd_default.h, These two commands will be included always. So move CONFIG_SYS_NO_FLASH definition to proper position. Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/configs/at91sam9m10g45ek.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index 0a4c781..ccfda71 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -76,6 +76,10 @@
/*
* Command line configuration.
*/
+
+/* No NOR flash */
+#define CONFIG_SYS_NO_FLASH
+
#include <config_cmd_default.h>
#undef CONFIG_CMD_BDI
#undef CONFIG_CMD_FPGA
@@ -96,9 +100,6 @@
#define CONFIG_SYS_INIT_SP_ADDR \
(CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE)
-/* No NOR flash */
-#define CONFIG_SYS_NO_FLASH
-
/* NAND flash */
#ifdef CONFIG_CMD_NAND
#define CONFIG_NAND_ATMEL