Skip to contentSkip to conversation

arm: atmel: sam9m10g45ek: let CONFIG_SYS_NO_FLASH at proper position

PATCH In review Bo Shen 2 participants 2 messages Nov 20, 2013 – Dec 1, 2013 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore

Bo Shen

author
#0 lore raw

PATCH 1/1 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.

---
 include/configs/at91sam9m10g45ek.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
include/configs/at91sam9m10g45ek.h +4 -3
index 2095fe6..eb86239 100644
@@ -77,6 +77,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
@@ -97,9 +101,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
Signature · 1 line
1.7.9.5
#1 lore raw

Dear Bo Shen,

Quoted 5 lines · Bo Shen

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.

Quoted 7 lines

So move CONFIG_SYS_NO_FLASH definition to proper position.

---
include/configs/at91sam9m10g45ek.h | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bie?mann