[U-Boot] [PATCH v3 2/2] Enable ROCKCHIP_SPL_BACK_TO_BROM for rock2 board

[Sandy Patterson]

Rock2 has been tested with back to brom feature. The tricky part is that
with this feature the default environment is inside u-boot, and it's
defined for every rk3288 board independetly. So I just changed it for
rock2 here if ROCKCHIP_SPL_BACK_TO_BROM.

Solve by moving environment after u-boot before 1M boundary

Signed-off-by: Sandy Patterson <apatterson at sightlogix.com>
---

Changes in v3:
 - Move activate in rock2_defconfig to proper commit.
 - Make environment changes dependent on ROCKCHIP_SPL_BACK_TO_BROM.

Changes in v2: None

 configs/rock2_defconfig | 2 +-
 include/configs/rock2.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
index b1294f0..e34d8b3 100644
--- a/configs/rock2_defconfig
+++ b/configs/rock2_defconfig
@@ -10,7 +10,7 @@ CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y
 CONFIG_SPL_PINCTRL_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_HUSH_PARSER=y
diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index ee924c3..99d6915 100644
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -16,11 +16,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
-- 
1.9.1