diff mbox

[U-Boot,v2,2/3] rockchip: configs: make rk3036 env config same as rk3288

Message ID 1479455542-21075-2-git-send-email-jacob2.chen@rock-chips.com
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Jacob Chen Nov. 18, 2016, 7:52 a.m. UTC
To make rockchip soc keep the same partition map


Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
---

Changes in v2:
- add a commit message

 include/configs/kylin_rk3036.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Comments

Simon Glass Nov. 19, 2016, 1:48 p.m. UTC | #1
Hi Jacob,

On 18 November 2016 at 00:52, Jacob Chen <jacob2.chen@rock-chips.com> wrote:
> To make rockchip soc keep the same partition map
>
>
> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
> ---
>
> Changes in v2:
> - add a commit message
>
>  include/configs/kylin_rk3036.h | 17 ++++++++++++++---
>  1 file changed, 14 insertions(+), 3 deletions(-)

Can this happen in the common file?

Regards,
Simon
Simon Glass Dec. 3, 2016, 4:50 a.m. UTC | #2
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:
>> To make rockchip soc keep the same partition map
>>
>>
>> Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
>> ---
>>
>> Changes in v2:
>> - add a commit message
>>
>>  include/configs/kylin_rk3036.h | 17 ++++++++++++++---
>>  1 file changed, 14 insertions(+), 3 deletions(-)
>
> Can this happen in the common file?
>
> Regards,
> Simon

Applied to u-boot-rockchip, thanks!
diff mbox

Patch

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index 4f0bd84..bc28525 100644
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -19,9 +19,20 @@ 
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV		0 /* emmc */
 #define CONFIG_SYS_MMC_ENV_PART		0 /* user area */
-#define CONFIG_ENV_OFFSET		(SZ_4M - SZ_64K) /* reserved area */
-#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+
+#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