#if defined(CONFIG_CMD_NAND) && defined(CONFIG_ENV_IS_IN_NAND)
 #define CONFIG_ENV_SIZE_REDUND         CONFIG_ENV_SIZE
 #define CONFIG_ENV_SECT_SIZE           (128 * 1024)
-#define CONFIG_ENV_RANGE               (512 * 1024)
-#define CONFIG_ENV_OFFSET              0x300000
+#define CONFIG_ENV_RANGE               (4 * CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_OFFSET              (24 * CONFIG_ENV_SECT_SIZE) /* 3 MiB */
 #define CONFIG_ENV_OFFSET_REDUND       \
                (CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)
 
 #define MTDIDS_DEFAULT                 "nand0=gpmi-nand"
 #define MTDPARTS_DEFAULT                       \
        "mtdparts=gpmi-nand:"                   \
-               "3m(bootloader)ro,"             \
-               "512k(environment),"            \
-               "512k(redundant-environment),"  \
-               "4m(kernel),"                   \
-               "128k(fdt),"                    \
-               "8m(ramdisk),"                  \
-               "-(filesystem)"
+               "3m(u-boot),"                   \
+               "512k(env1),"                   \
+               "512k(env2),"                   \
+               "14m(boot),"                    \
+               "238m(data),"                   \
+               "-@4096k(UBI)"
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #endif