diff options
| author | Wu, Josh <Josh.wu@atmel.com> | 2015-08-19 19:11:20 +0800 |
|---|---|---|
| committer | Andreas Bießmann <andreas.devel@googlemail.com> | 2015-08-21 15:47:05 +0200 |
| commit | dc018fef2fd11555d6492a242256da68d07c8ef2 (patch) | |
| tree | e09ff3f3b3831df65bde77b31608fbfd83ba58aa | |
| parent | 89a3658ac02873f32d7ad0a3b1d3c5308c5e2528 (diff) | |
| download | u-boot-dc018fef2fd11555d6492a242256da68d07c8ef2.tar.gz u-boot-dc018fef2fd11555d6492a242256da68d07c8ef2.tar.xz u-boot-dc018fef2fd11555d6492a242256da68d07c8ef2.zip | |
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>
| -rw-r--r-- | include/configs/at91-sama5_common.h | 12 | ||||
| -rw-r--r-- | include/configs/sama5d3_xplained.h | 9 | ||||
| -rw-r--r-- | include/configs/sama5d3xek.h | 9 | ||||
| -rw-r--r-- | include/configs/sama5d4_xplained.h | 9 | ||||
| -rw-r--r-- | include/configs/sama5d4ek.h | 9 |
5 files changed, 16 insertions, 32 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 0fe0852821..9c3ebd0e17 100644 --- 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 91ef1236e7..73de62cddd 100644 --- 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 7b2f69a27b..dc26ba7457 100644 --- 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 fe585c431e..c5adf6d2ef 100644 --- 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 ee31e9de88..be2c2cec3d 100644 --- 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 |