Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / rockchip-common.h

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 35d948ae29f196897b6666ead7ece10682bab9da..26d41b50759d89bb3e8871997861a6730515dafa 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -9,7 +9,6 @@
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 /* First try to boot from SD (index 0), then eMMC (index 1) */
 #if CONFIG_IS_ENABLED(CMD_MMC)
@@ -52,21 +51,13 @@
 #define PARTS_DEFAULT \
        "uuid_disk=${uuid_gpt_disk};" \
        "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \
-       "name=reserved1,size=64K,uuid=${uuid_gpt_reserved1};" \
-       "name=reserved2,size=4M,uuid=${uuid_gpt_reserved2};" \
-       "name=loader2,size=4MB,uuid=${uuid_gpt_loader2};" \
-       "name=atf,size=4M,uuid=${uuid_gpt_atf};" \
+       "name=loader2,start=8MB,size=4MB,uuid=${uuid_gpt_loader2};" \
+       "name=trust,size=4M,uuid=${uuid_gpt_atf};" \
        "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \
        "name=rootfs,size=-,uuid="ROOT_UUID
 
 #endif
 
-/*
- * Rockchip SoCs use fixed ENV 32KB@(4MB-32KB)
- */
-#define CONFIG_ENV_OFFSET      (SZ_4M - SZ_32K)
-#define CONFIG_ENV_SIZE                SZ_32K
-
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 #endif /* _ROCKCHIP_COMMON_H_ */