From c742043f742f56b6566456e91411cf00120096f2 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Tue, 31 Oct 2017 15:52:19 +0800 Subject: [PATCH] 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- include/configs/rockchip-common.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) 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 -- 2.25.1