From c5a4141343e601bac2789c137e8be665c074f898 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Tue, 31 Oct 2017 16:52:23 +0800 Subject: rockchip: config: update part table User do not need to access the reserved part in system, remove them from partition table. Rename atf to trust as generic name for armv7 do not use ATF. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- include/configs/rockchip-common.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 35d948ae29..4139a7b73d 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -52,10 +52,8 @@ #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 -- cgit From 81f53b0dafdfe9458f6d04fc5ec2732c2ea23a71 Mon Sep 17 00:00:00 2001 From: Klaus Goger Date: Mon, 11 Dec 2017 17:56:08 +0100 Subject: rockchip: move CONFIG_ENV_SIZE and CONFIG_ENV_OFFSET to Kconfig This commit adds ENV_SIZE and ENV_OFFSET configuration items for ARCH_ROCKCHIP, but keeps these non-visible (i.e. not prompt is given). With these new items present, the configuration from the header files is moved to Kconfig. Keeping these non-visible is necessary to have the possibility to select new default values if CONFIG_IS_IN_* is changed (interactively or with oldconfig). Otherwise it will always be set to a previous value if used with a prompt. As an example if we do a defconfig with CONFIG_IS_IN_MMC and change it to CONFIG_IS_IN_SPI_FLASH via menuconfig, ENV_SIZE and ENV_OFFSET will not be changed to the correct values as defconfig will already have set them to the default values of CONFIG_IS_IN_MMC in .config. Signed-off-by: Klaus Goger Reviewed-by: Philipp Tomsich --- include/configs/puma_rk3399.h | 8 -------- include/configs/rockchip-common.h | 6 ------ 2 files changed, 14 deletions(-) (limited to 'include') 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 -/* - * 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 4139a7b73d..f465d35330 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -59,12 +59,6 @@ #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_ */ -- cgit