diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-05 16:30:17 +0200 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-05 16:30:17 +0200 |
commit | 25a4f6426745a5c31588c89aa51396cee438b748 (patch) | |
tree | 40a728e1d7dd3e069e82e0cf1bc3b53988153ef3 | |
parent | ce75b5292018f8a1cb1b3384b97679300cf1b7d7 (diff) |
colibri_t20: adjust cfgblock & u-boot env locations in flash
Swap the order of the Toradex factory configuration block location in
respect to the U-Boot environment. This to again be in-line with
mainline.
Move the Toradex factory configuration block to a 3 MB offset.
-rw-r--r-- | board/toradex/colibri_t20/Kconfig | 2 | ||||
-rw-r--r-- | include/configs/colibri_t20.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/board/toradex/colibri_t20/Kconfig b/board/toradex/colibri_t20/Kconfig index 29bb33013c..9b68d5fc24 100644 --- a/board/toradex/colibri_t20/Kconfig +++ b/board/toradex/colibri_t20/Kconfig @@ -16,6 +16,6 @@ config TRDX_HAVE_NAND default y config TRDX_CFG_BLOCK_OFFSET - default "2097152" + default "3145728" endif diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index c566c75178..b50516516d 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -95,17 +95,18 @@ #define MTDIDS_DEFAULT "nand0=tegra_nand" #define MTDPARTS_DEFAULT "mtdparts=tegra_nand:" \ "2m(u-boot)ro," \ - "512k(cfgblock)ro," \ - "512k(u-boot-env)," \ + "1m(u-boot-env)," \ + "1m(cfgblock)ro," \ "-(ubi)" #undef CONFIG_CMD_IMLS /* Environment in NAND, 64K is a bit excessive but erase block is 512K anyway */ #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET (SZ_2M + SZ_512K) +#define CONFIG_ENV_OFFSET (SZ_2M) #undef CONFIG_ENV_SIZE /* undef size from tegra20-common.h */ #define CONFIG_ENV_SIZE (SZ_64K) +#define CONFIG_ENV_RANGE (SZ_1M) #define CONFIG_RBTREE #define CONFIG_LZO |