| Message ID | 1479455542-21075-1-git-send-email-jacob2.chen@rock-chips.com |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Jacob, On 18 November 2016 at 00:52, Jacob Chen <jacob2.chen@rock-chips.com> wrote: > With CONFIG_ROCKCHIP_SPL_BACK_TO_BROM enabled, > the environment is inside u-boot. > So solve it by moving environment after u-boot. Can this not happen in the rk3288_common.h file? > > Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> > --- > > Changes in v2: > - add a commit message > > include/configs/evb_rk3288.h | 9 +++++++++ > include/configs/fennec_rk3288.h | 9 +++++++++ > include/configs/miniarm_rk3288.h | 9 +++++++++ > include/configs/popmetal_rk3288.h | 9 +++++++++ > 4 files changed, 36 insertions(+) > Regards, Simon
On 19 November 2016 at 06:48, Simon Glass <sjg@chromium.org> wrote: > Hi Jacob, > > On 18 November 2016 at 00:52, Jacob Chen <jacob2.chen@rock-chips.com> wrote: >> With CONFIG_ROCKCHIP_SPL_BACK_TO_BROM enabled, >> the environment is inside u-boot. >> So solve it by moving environment after u-boot. > > Can this not happen in the rk3288_common.h file? > >> >> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> >> --- >> >> Changes in v2: >> - add a commit message >> >> include/configs/evb_rk3288.h | 9 +++++++++ >> include/configs/fennec_rk3288.h | 9 +++++++++ >> include/configs/miniarm_rk3288.h | 9 +++++++++ >> include/configs/popmetal_rk3288.h | 9 +++++++++ >> 4 files changed, 36 insertions(+) >> > > Regards, > Simon Applied to u-boot-rockchip, thanks!
diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 390c243..90b810a 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -12,11 +12,20 @@ #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 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 390c243..90b810a 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -12,11 +12,20 @@ #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 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h index aa259db..645d023 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -17,11 +17,20 @@ #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 #define CONFIG_CONSOLE_SCROLL_LINES 10 diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 390c243..90b810a 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -12,11 +12,20 @@ #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 #define CONFIG_CONSOLE_SCROLL_LINES 10
With CONFIG_ROCKCHIP_SPL_BACK_TO_BROM enabled, the environment is inside u-boot. So solve it by moving environment after u-boot. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> --- Changes in v2: - add a commit message include/configs/evb_rk3288.h | 9 +++++++++ include/configs/fennec_rk3288.h | 9 +++++++++ include/configs/miniarm_rk3288.h | 9 +++++++++ include/configs/popmetal_rk3288.h | 9 +++++++++ 4 files changed, 36 insertions(+)