Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / kylin_rk3036.h

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index e8ca76d..bc28525 100644 (file)
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -19,37 +19,21 @@
 #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
-
-/* Enable gpt partition table */
-#define CONFIG_CMD_GPT
-#define CONFIG_RANDOM_UUID
-#define PARTS_DEFAULT \
-       "uuid_disk=${uuid_gpt_disk};" \
-       "name=loader,start=32K,size=4000K,uuid=${uuid_gpt_loader};" \
-       "name=reserved,size=64K,uuid=${uuid_gpt_reserved};" \
-       "name=misc,size=4M,uuid=${uuid_gpt_misc};" \
-       "name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \
-       "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \
-       "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \
-       "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \
-       "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \
-       "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \
-       "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \
-       "name=cache,size=100M,uuid=${uuid_gpt_cache};" \
-       "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \
-       "name=persist,size=4M,uuid=${uuid_gpt_persist};" \
-       "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \
-
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "partitions=" PARTS_DEFAULT \
 
+#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_BOARD_LATE_INIT
-#define CONFIG_PREBOOT
+#endif
 
 #endif