| Message ID | 1442612952-21498-3-git-send-email-sjoerd.simons@collabora.co.uk |
|---|---|
| State | Accepted |
| Commit | abe919ec5487bda93245369eb103b20e182fd8b5 |
| Headers | show |
On 18 September 2015 at 22:49, Sjoerd Simons <sjoerd.simons@collabora.co.uk> wrote: > Save the environment on the SD card for Firefly in the empty space > between the SPL and the u-boot image. > > Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> > > --- > > include/configs/chromebook_jerry.h | 1 + > include/configs/firefly-rk3288.h | 8 ++++++++ > include/configs/rk3288_common.h | 1 - > 3 files changed, 9 insertions(+), 1 deletion(-) Acked-by: Simon Glass <sjg@chromium.org>
On 3 October 2015 at 08:27, Simon Glass <sjg@chromium.org> wrote: > On 18 September 2015 at 22:49, Sjoerd Simons > <sjoerd.simons@collabora.co.uk> wrote: >> Save the environment on the SD card for Firefly in the empty space >> between the SPL and the u-boot image. >> >> Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> >> >> --- >> >> include/configs/chromebook_jerry.h | 1 + >> include/configs/firefly-rk3288.h | 8 ++++++++ >> include/configs/rk3288_common.h | 1 - >> 3 files changed, 9 insertions(+), 1 deletion(-) > > Acked-by: Simon Glass <sjg@chromium.org> Applied to u-boot-rockchip, thanks!
diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index a22b123..058325c 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -9,6 +9,7 @@ #include <configs/rk3288_common.h> +#define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index a82adc8..4c5c4dd 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -11,4 +11,12 @@ #define CONFIG_SPL_MMC_SUPPORT +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 0 +/* SPL @ 32k for ~36k + * ENV @ 96k + * u-boot @ 128K + */ +#define CONFIG_ENV_OFFSET (96 * 1024) + #endif diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 400e72c..5b1653e 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_SIZE 0x2000 #define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_MAXARGS 16
Save the environment on the SD card for Firefly in the empty space between the SPL and the u-boot image. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> --- include/configs/chromebook_jerry.h | 1 + include/configs/firefly-rk3288.h | 8 ++++++++ include/configs/rk3288_common.h | 1 - 3 files changed, 9 insertions(+), 1 deletion(-)