| Message ID | 1484626779-31235-1-git-send-email-jacob2.chen@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 3d1bf166bf1ea93bbf19cd26b25fdcfe805aa58d |
| Delegated to: | Simon Glass |
| Headers | show |
On 16 January 2017 at 21:19, Jacob Chen <jacob2.chen@rock-chips.com> wrote: > To reduce redundant code. > > Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> > --- > > include/configs/evb_rk3288.h | 14 -------------- > include/configs/fennec_rk3288.h | 14 -------------- > include/configs/kylin_rk3036.h | 14 -------------- > include/configs/miniarm_rk3288.h | 14 -------------- > include/configs/popmetal_rk3288.h | 14 -------------- > include/configs/rock2.h | 14 -------------- > include/configs/rockchip-common.h | 14 ++++++++++++++ > 7 files changed, 14 insertions(+), 84 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 20 January 2017 at 19:51, Simon Glass <sjg@chromium.org> wrote: > On 16 January 2017 at 21:19, Jacob Chen <jacob2.chen@rock-chips.com> wrote: >> To reduce redundant code. >> >> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> >> --- >> >> include/configs/evb_rk3288.h | 14 -------------- >> include/configs/fennec_rk3288.h | 14 -------------- >> include/configs/kylin_rk3036.h | 14 -------------- >> include/configs/miniarm_rk3288.h | 14 -------------- >> include/configs/popmetal_rk3288.h | 14 -------------- >> include/configs/rock2.h | 14 -------------- >> include/configs/rockchip-common.h | 14 ++++++++++++++ >> 7 files changed, 14 insertions(+), 84 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 554ca0e..6a068bb 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 554ca0e..6a068bb 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 bc28525..088aced 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 5a623ca..860eb40 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 554ca0e..6a068bb 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 b9c2290..ec555dd 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 be53e65..eb5f1ef 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -34,4 +34,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_ */
To reduce redundant code. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> --- include/configs/evb_rk3288.h | 14 -------------- include/configs/fennec_rk3288.h | 14 -------------- include/configs/kylin_rk3036.h | 14 -------------- include/configs/miniarm_rk3288.h | 14 -------------- include/configs/popmetal_rk3288.h | 14 -------------- include/configs/rock2.h | 14 -------------- include/configs/rockchip-common.h | 14 ++++++++++++++ 7 files changed, 14 insertions(+), 84 deletions(-)