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.

diff --git a/board/toradex/colibri_t20/Kconfig b/board/toradex/colibri_t20/Kconfig
index 29bb33013cc0f3a90b4f75b8ccecdc2bf60c80c4..9b68d5fc24e005b13fffae5dc8ab718d4c3ea4d1 100644 (file)
--- 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 c566c751788f122d840f5afc507521a647f2d2f5..b50516516dc4fd74058a0fee3d51ec6f63fb076a 100644 (file)
--- 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