mirror of
https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git
synced 2025-12-10 07:44:53 +01:00
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>
This commit is contained in:
parent
89a3658ac0
commit
dc018fef2f
5 changed files with 16 additions and 32 deletions
|
|
@ -77,6 +77,18 @@
|
||||||
"256K(env),256k(env_redundent),256k(spare)," \
|
"256K(env),256k(env_redundent),256k(spare)," \
|
||||||
"512k(dtb),6M(kernel)ro,-(rootfs) " \
|
"512k(dtb),6M(kernel)ro,-(rootfs) " \
|
||||||
"rootfstype=ubifs ubi.mtd=7 root=ubi0: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
|
#endif
|
||||||
|
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
|
||||||
|
|
@ -115,14 +115,7 @@
|
||||||
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
|
#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */
|
||||||
|
|
||||||
#if CONFIG_SYS_USE_NANDFLASH
|
#if CONFIG_SYS_USE_NANDFLASH
|
||||||
/* bootstrap + u-boot + env in nandflash */
|
/* override the bootcmd, bootargs and other configuration for nandflash env */
|
||||||
#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"
|
|
||||||
#elif CONFIG_SYS_USE_MMC
|
#elif CONFIG_SYS_USE_MMC
|
||||||
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -165,14 +165,7 @@
|
||||||
"sf read 0x22000000 0x42000 0x300000; " \
|
"sf read 0x22000000 0x42000 0x300000; " \
|
||||||
"bootm 0x22000000"
|
"bootm 0x22000000"
|
||||||
#elif CONFIG_SYS_USE_NANDFLASH
|
#elif CONFIG_SYS_USE_NANDFLASH
|
||||||
/* bootstrap + u-boot + env in nandflash */
|
/* override the bootcmd, bootargs and other configuration nandflash env */
|
||||||
#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"
|
|
||||||
#elif CONFIG_SYS_USE_MMC
|
#elif CONFIG_SYS_USE_MMC
|
||||||
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -129,14 +129,7 @@
|
||||||
"sf read 0x22000000 0x100000 0x300000; " \
|
"sf read 0x22000000 0x100000 0x300000; " \
|
||||||
"bootz 0x22000000 - 0x21000000"
|
"bootz 0x22000000 - 0x21000000"
|
||||||
#elif CONFIG_SYS_USE_NANDFLASH
|
#elif CONFIG_SYS_USE_NANDFLASH
|
||||||
/* bootstrap + u-boot + env in nandflash */
|
/* override the bootcmd, bootargs and other configuration for nandflash env */
|
||||||
#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"
|
|
||||||
#elif CONFIG_SYS_USE_MMC
|
#elif CONFIG_SYS_USE_MMC
|
||||||
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -127,14 +127,7 @@
|
||||||
"sf read 0x22000000 0x100000 0x300000; " \
|
"sf read 0x22000000 0x100000 0x300000; " \
|
||||||
"bootz 0x22000000 - 0x21000000"
|
"bootz 0x22000000 - 0x21000000"
|
||||||
#elif CONFIG_SYS_USE_NANDFLASH
|
#elif CONFIG_SYS_USE_NANDFLASH
|
||||||
/* bootstrap + u-boot + env in nandflash */
|
/* override the bootcmd, bootargs and other configuration for nandflash env*/
|
||||||
#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"
|
|
||||||
#elif CONFIG_SYS_USE_MMC
|
#elif CONFIG_SYS_USE_MMC
|
||||||
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
/* override the bootcmd, bootargs and other configuration for sd/mmc env */
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue