From: Jacob Chen <jacob2.chen@rock-chips.com>
Date: Fri, 18 Nov 2016 07:54:26 +0000 (+0800)
Subject: rockchip: configs: make rk3036 env config same as rk3288
X-Git-Tag: v2017.03-rc1~136^2~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=21ba55dd72b50f5730d8cb57c35ab0a6aa0c08f5;p=oweals%2Fu-boot.git

rockchip: configs: make rk3036 env config same as rk3288

To make rockchip soc keep the same partition map

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
---

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index 4f0bd84ad8..bc28525844 100644
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -19,9 +19,20 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		0 /* emmc */
 #define CONFIG_SYS_MMC_ENV_PART		0 /* user area */
-#define CONFIG_ENV_OFFSET		(SZ_4M - SZ_64K) /* reserved area */
-#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+
+#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
+/* SPL @ 32k for 34k
+ * u-boot directly after @ 68k for 400k or so
+ * ENV @ 992k
+ */
+#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
+#else
+/* SPL @ 32k for ~36k
+ * ENV @ 96k
+ * u-boot @ 128K
+ */
+#define CONFIG_ENV_OFFSET (96 * 1024)
+#endif
 
 #endif