rockchip: move partitons define from 3036-kylin to 3036-common

To keep it same with 3288.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/include/configs/kylin_rk3036.h b/include/configs/kylin_rk3036.h
index e8ca76dfcfaf68cb0fb7289d899a31515b662dcb..39fb2393e36819e1866243bbdc93c8a85534354c 100644 (file)
--- a/include/configs/kylin_rk3036.h
+++ b/include/configs/kylin_rk3036.h
@@ -23,30 +23,6 @@
 #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 \
-
 #endif
 
 #define CONFIG_BOARD_LATE_INIT

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 1b411c06320883e8d542547dd568a3b53d36a7ae..6ddf0d9f4b8dcac27632f96515d1e2d08c890362 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -79,6 +79,9 @@
 #define CONFIG_G_DNL_VENDOR_NUM                0x2207
 #define CONFIG_G_DNL_PRODUCT_NUM       0x310a
 
+/* Enable gpt partition table */
+#define CONFIG_CMD_GPT
+
 #include <config_distro_defaults.h>
 
 #define ENV_MEM_LAYOUT_SETTINGS \
@@ -88,6 +91,12 @@
        "kernel_addr_r=0x62000000\0" \
        "ramdisk_addr_r=0x64000000\0"
 
+#define CONFIG_RANDOM_UUID
+#define PARTS_DEFAULT \
+       "uuid_disk=${uuid_gpt_disk};" \
+       "name=boot,start=8M,size=64M,bootable,uuid=${uuid_gpt_boot};" \
+       "name=rootfs,size=-,uuid=${uuid_gpt_rootfs};\0" \
+
 /* First try to boot from SD (index 0), then eMMC (index 1 */
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
@@ -99,6 +108,7 @@
  * so limit the fdt reallocation to that */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "fdt_high=0x7fffffff\0" \
+       "partitions=" PARTS_DEFAULT \
        ENV_MEM_LAYOUT_SETTINGS \
        BOOTENV
 #endif