From: Kever Yang <kever.yang@rock-chips.com>
Date: Tue, 31 Oct 2017 07:52:19 +0000 (+0800)
Subject: rockchip: config: sync the ENV offset from rockchip legacy U-Boot
X-Git-Tag: v2017.11~18
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c742043f742f56b6566456e91411cf00120096f2;p=u-boot

rockchip: config: sync the ENV offset from rockchip legacy U-Boot

Using the ENV offset from rockchip legacy U-Boot for all SoCs,
the offset is 4MB-32KB

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 96b5fce46f..3fc1b7153b 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -61,19 +61,10 @@
 
 #endif
 
-#if CONFIG_IS_ENABLED(ROCKCHIP_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
+/*
+ * Rockchip SoCs use fixed ENV 32KB@(4MB-32KB)
  */
-#define CONFIG_ENV_OFFSET (96 * 1024)
-#endif
+#define CONFIG_ENV_OFFSET	(SZ_4M - SZ_32K)
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE