From 782358fb7628bd97aa9e14ee91a171686fbf631a Mon Sep 17 00:00:00 2001 From: Bo Shen <voice.shen@atmel.com> Date: Wed, 20 Nov 2013 11:17:16 +0800 Subject: [PATCH] arm: atmel: sam9m10g45ek: let CONFIG_SYS_NO_FLASH at proper position MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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> --- include/configs/at91sam9m10g45ek.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0a4c781d3d..ccfda71c95 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 -- 2.39.5