rockchip: config: use common CONFIG_ENV_SIZE for all SoCs

All Rockchip SoCs use 32KB as CONFIG_ENV_SIZE. 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>
7 years ago · be942f2e0d
parent c742043f74
commit be942f2e0d
11 changed files with 1 additions and 12 deletions
--- a/include/configs/evb_rk3229.h
+++ b/include/configs/evb_rk3229.h
@ -11,8 +11,6 @@


 /* Store env in emmc */
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE                 (32 << 10)
 #define CONFIG_SYS_MMC_ENV_DEV          0
 #define CONFIG_SYS_MMC_ENV_PART         0
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@ -13,8 +13,6 @@
 #ifndef CONFIG_SPL_BUILD

 /* Store env in emmc */
-#undef CONFIG_ENV_SIZE
-#define CONFIG_ENV_SIZE			SZ_32K
 #define CONFIG_SYS_MMC_ENV_DEV		0 /* emmc */
 #define CONFIG_SYS_MMC_ENV_PART		0 /* user area */

--- a/include/configs/lion_rk3368.h
+++ b/include/configs/lion_rk3368.h
@ -13,6 +13,5 @@
 #define KERNEL_LOAD_ADDR		0x280000
 #define DTB_LOAD_ADDR			0x5600000
 #define INITRD_LOAD_ADDR		0x5bf0000
-#define CONFIG_ENV_SIZE			0x2000

 #endif
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@ -10,7 +10,6 @@
 #include "rockchip-common.h"

 #define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@ -14,7 +14,6 @@

 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
 #define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024

--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@ -10,7 +10,6 @@
 #include "rockchip-common.h"

 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/*  64M */
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@ -12,7 +12,6 @@

 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
 #define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024

--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@ -9,7 +9,6 @@

 #include "rockchip-common.h"

-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@ -10,7 +10,6 @@
 #include "rockchip-common.h"

 #define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@ -65,6 +65,7 @@
 * Rockchip SoCs use fixed ENV 32KB@(4MB-32KB)
 */
 #define CONFIG_ENV_OFFSET	(SZ_4M - SZ_32K)
+#define CONFIG_ENV_SIZE		SZ_32K

 #define CONFIG_DISPLAY_BOARDINFO_LATE

--- a/include/configs/sheep_rk3368.h
+++ b/include/configs/sheep_rk3368.h
@ -13,7 +13,6 @@
 #define KERNEL_LOAD_ADDR		0x280000
 #define DTB_LOAD_ADDR			0x5600000
 #define INITRD_LOAD_ADDR		0x5bf0000
-#define CONFIG_ENV_SIZE			0x2000

 #define CONFIG_CONSOLE_SCROLL_LINES	10