diff options
| author | Jacob Chen <jacob2.chen@rock-chips.com> | 2017-01-17 12:19:38 +0800 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-02-09 12:10:59 -0700 |
| commit | 3d1bf166bf1ea93bbf19cd26b25fdcfe805aa58d (patch) | |
| tree | a4fc7c1845177cb2b7cf4b0cda64510d8fc10d4d | |
| parent | f568ac219c8db716df1726b383a70553407ca77e (diff) | |
| download | u-boot-3d1bf166bf1ea93bbf19cd26b25fdcfe805aa58d.tar.gz u-boot-3d1bf166bf1ea93bbf19cd26b25fdcfe805aa58d.tar.bz2 u-boot-3d1bf166bf1ea93bbf19cd26b25fdcfe805aa58d.zip | |
rockchip: configs: move env offset to common header
To reduce redundant code.
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | include/configs/evb_rk3288.h | 14 | ||||
| -rw-r--r-- | include/configs/fennec_rk3288.h | 14 | ||||
| -rw-r--r-- | include/configs/kylin_rk3036.h | 14 | ||||
| -rw-r--r-- | include/configs/miniarm_rk3288.h | 14 | ||||
| -rw-r--r-- | include/configs/popmetal_rk3288.h | 14 | ||||
| -rw-r--r-- | include/configs/rock2.h | 14 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 14 |
7 files changed, 14 insertions, 84 deletions
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 554ca0e636..6a068bb8c0 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -13,20 +13,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#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 - #define CONFIG_SYS_WHITE_ON_BLACK #endif diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 554ca0e636..6a068bb8c0 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -13,20 +13,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#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 - #define CONFIG_SYS_WHITE_ON_BLACK #endif diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h index bc28525844..088aced8b6 100644 --- a/include/configs/kylin_rk3036.h +++ b/include/configs/kylin_rk3036.h @@ -20,20 +20,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 /* emmc */ #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */ -#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 #endif diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h index 5a623ca6ea..860eb404fb 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -18,20 +18,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#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 - #define CONFIG_SYS_WHITE_ON_BLACK #endif diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 554ca0e636..6a068bb8c0 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -13,20 +13,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 -#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 - #define CONFIG_SYS_WHITE_ON_BLACK #endif diff --git a/include/configs/rock2.h b/include/configs/rock2.h index b9c2290139..ec555dd966 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -17,20 +17,6 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 -#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 - #define CONFIG_SYS_WHITE_ON_BLACK #endif diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9e71b3f78d..fd930c101e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -31,4 +31,18 @@ #endif +#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 /* _ROCKCHIP_COMMON_H_ */ |