ARM: at91: sama5: move the nandflash env config to at91-sama5_common.h

As all sama5 nandflash env configurations are same, so move them to
at91-sama5_common.h.

Signed-off-by: Josh Wu <josh.wu@atmel.com>

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 0fe0852821a2e2cdb5024febf0b3c5dae22844e4..9c3ebd0e1700dca42dde25aa26c161fc55284dfc 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -77,6 +77,18 @@
        "256K(env),256k(env_redundent),256k(spare),"                    \
        "512k(dtb),6M(kernel)ro,-(rootfs) "                             \
        "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
+
+#ifdef CONFIG_SYS_USE_NANDFLASH
+/* u-boot env in nand flash */
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_OFFSET              0xc0000
+#define CONFIG_ENV_OFFSET_REDUND       0x100000
+#define CONFIG_ENV_SIZE                        0x20000
+#define CONFIG_BOOTCOMMAND             "nand read 0x21000000 0x180000 0x80000;"        \
+                                       "nand read 0x22000000 0x200000 0x600000;"       \
+                                       "bootz 0x22000000 - 0x21000000"
+#endif
+
 #endif
 
 #define CONFIG_BAUDRATE                        115200

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index 91ef1236e7e64738238acc28b7e913038737442e..73de62cddd5ddcb5359fccef783328b629902207 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -115,14 +115,7 @@
 #define CONFIG_SYS_LOAD_ADDR                   0x22000000 /* load address */
 
 #if CONFIG_SYS_USE_NANDFLASH
-/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0xc0000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
-#define CONFIG_BOOTCOMMAND     "nand read 0x21000000 0x180000 0x80000;" \
-                               "nand read 0x22000000 0x200000 0x600000;" \
-                               "bootz 0x22000000 - 0x21000000"
+/* override the bootcmd, bootargs and other configuration for nandflash env */
 #elif CONFIG_SYS_USE_MMC
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #else

diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index 7b2f69a27b39cab100379a15d245632467109fb6..dc26ba74573e3bded44b9d865f322e3b5157c3b7 100644 (file)
--- a/include/configs/sama5d3xek.h
+++ b/include/configs/sama5d3xek.h
@@ -165,14 +165,7 @@
                                "sf read 0x22000000 0x42000 0x300000; " \
                                "bootm 0x22000000"
 #elif CONFIG_SYS_USE_NANDFLASH
-/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0xc0000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
-#define CONFIG_BOOTCOMMAND     "nand read 0x21000000 0x180000 0x80000;" \
-                               "nand read 0x22000000 0x200000 0x600000;" \
-                               "bootm 0x22000000 - 0x21000000"
+/* override the bootcmd, bootargs and other configuration nandflash env */
 #elif CONFIG_SYS_USE_MMC
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #else

diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
index fe585c431e89bb27181b144cd782c8691ea49d7b..c5adf6d2ef31711f39ef788e55d804b8260cdbc6 100644 (file)
--- a/include/configs/sama5d4_xplained.h
+++ b/include/configs/sama5d4_xplained.h
@@ -129,14 +129,7 @@
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootz 0x22000000 - 0x21000000"
 #elif CONFIG_SYS_USE_NANDFLASH
-/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0xc0000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
-#define CONFIG_BOOTCOMMAND     "nand read 0x21000000 0x180000 0x80000;" \
-                               "nand read 0x22000000 0x200000 0x600000;" \
-                               "bootz 0x22000000 - 0x21000000"
+/* override the bootcmd, bootargs and other configuration for nandflash env */
 #elif CONFIG_SYS_USE_MMC
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif

diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h
index ee31e9de885903a8b45f60c59321e51b37690de7..be2c2cec3df29f210c75b148d56f8f6684bea6a0 100644 (file)
--- a/include/configs/sama5d4ek.h
+++ b/include/configs/sama5d4ek.h
@@ -127,14 +127,7 @@
                                "sf read 0x22000000 0x100000 0x300000; " \
                                "bootz 0x22000000 - 0x21000000"
 #elif CONFIG_SYS_USE_NANDFLASH
-/* bootstrap + u-boot + env in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
-#define CONFIG_ENV_OFFSET              0xc0000
-#define CONFIG_ENV_OFFSET_REDUND       0x100000
-#define CONFIG_ENV_SIZE                        0x20000
-#define CONFIG_BOOTCOMMAND     "nand read 0x21000000 0x180000 0x80000;" \
-                               "nand read 0x22000000 0x200000 0x600000;" \
-                               "bootz 0x22000000 - 0x21000000"
+/* override the bootcmd, bootargs and other configuration for nandflash env*/
 #elif CONFIG_SYS_USE_MMC
 /* override the bootcmd, bootargs and other configuration for sd/mmc env */
 #endif