From be942f2e0dca3065ba530555bb6860dafd60ba16 Mon Sep 17 00:00:00 2001 From: Kever Yang <kever.yang@rock-chips.com> Date: Tue, 31 Oct 2017 15:52:20 +0800 Subject: [PATCH] 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> --- include/configs/evb_rk3229.h | 2 -- include/configs/kylin_rk3036.h | 2 -- include/configs/lion_rk3368.h | 1 - include/configs/rk3036_common.h | 1 - include/configs/rk3188_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/rockchip-common.h | 1 + include/configs/sheep_rk3368.h | 1 - 11 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h index 8906c8f0b1..ae981f7610 100644 --- 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 diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index 36009b8599..d2d630d610 100644 --- 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 */ diff --git a/include/configs/lion_rk3368.h b/include/configs/lion_rk3368.h index 4118ffd65b..c40dbadc15 100644 --- 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 diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 9ac0df57de..4ed8f5a6c7 100644 --- 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 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 5e462346be..cfa5364710 100644 --- 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 diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index fa9abc0a56..b22169d163 100644 --- 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 */ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 34f255847a..2b8f618f72 100644 --- 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 diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index 9819b22ce2..af556323f8 100644 --- 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 diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index 1d7a87271c..561bfa73b6 100644 --- 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 diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 3fc1b7153b..35d948ae29 100644 --- 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 diff --git a/include/configs/sheep_rk3368.h b/include/configs/sheep_rk3368.h index eac9755bba..4eb4fb0e2f 100644 --- 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 -- 2.39.5