diff options
| author | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-18 18:39:18 -0500 |
| commit | eeab579aa8d76b96afbd0862029d4452943bafbe (patch) | |
| tree | 446ba45437bfa80ab191c4137ad3c5a7c86c720c /include | |
| parent | 1a3fc354b50b2a86361964b6d695ce26058248f5 (diff) | |
| parent | cbe503793aba03c19b8d21e0a6e344afe624e2d6 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/puma_rk3399.h | 8 | ||||
| -rw-r--r-- | include/configs/rockchip-common.h | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index 39d0786266..6523a7c34a 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -9,14 +9,6 @@ #include <configs/rk3399_common.h> -/* - * SPL @ 32kB for ~130kB - * ENV @ 240KB for 8kB - * FIT payload (ATF, U-Boot, FDT) @ 256kB - */ -#undef CONFIG_ENV_OFFSET -#define CONFIG_ENV_OFFSET (240 * 1024) - #if defined(CONFIG_ENV_IS_IN_MMC) #define CONFIG_SYS_MMC_ENV_DEV 1 #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 35d948ae29..f465d35330 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -52,21 +52,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_ */ |