[PATCH v2 3/5] rockchip: rk3399-pinephone-pro: Fix SPL max size and SPI flash payload offset

[Kever Yang]

On 2023/7/28 19:38, Jonas Karlman wrote:
> TPL max size is limited to 184 KB, SPL is loaded to 0x0 and TF-A is
> loaded to 0x40000, this limit SPL max size to 256 KB. With BootRom only
> reading first 2 KB per 4 KB page of SPI flash, 880 KB may be needed for
> TPL+SPL in a worst-case scenario. (184 KB + 256 KB) x 2 = 880 KB
>
> Use 0xE0000 (896 KB) as the payload offset in SPI flash, this allows
> for a payload of 3168 KB before env offset start to overlap.
>
> Also add CONFIG_ROCKCHIP_SPI_IMAGE=y to build a bootable SPI flash
> image, u-boot-rockchip-spi.bin.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
> Reviewed-by: Quentin Schulz <foss+u-boot at 0leil.net>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2:
> - Rebase on u-boot-rockchip/master
> - Collect r-b tags
>
>   arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 4 ----
>   configs/pinephone-pro-rk3399_defconfig        | 4 +++-
>   2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> index 347243fe4793..cabf0a9dae89 100644
> --- a/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
> @@ -10,10 +10,6 @@
>   	chosen {
>   		u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
>   	};
> -
> -	config {
> -		u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
> -	};
>   };
>   
>   &rng {
> diff --git a/configs/pinephone-pro-rk3399_defconfig b/configs/pinephone-pro-rk3399_defconfig
> index f97a4003bbad..11243bc5c193 100644
> --- a/configs/pinephone-pro-rk3399_defconfig
> +++ b/configs/pinephone-pro-rk3399_defconfig
> @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinephone-pro"
>   CONFIG_DM_RESET=y
>   CONFIG_ROCKCHIP_RK3399=y
> +CONFIG_ROCKCHIP_SPI_IMAGE=y
>   CONFIG_TARGET_PINEPHONE_PRO_RK3399=y
>   CONFIG_SPL_STACK=0x400000
>   CONFIG_DEBUG_UART_BASE=0xFF1A0000
> @@ -25,7 +26,7 @@ CONFIG_USE_PREBOOT=y
>   CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinephone-pro.dtb"
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
>   CONFIG_MISC_INIT_R=y
> -CONFIG_SPL_MAX_SIZE=0x2e000
> +CONFIG_SPL_MAX_SIZE=0x40000
>   CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
>   CONFIG_SPL_BSS_START_ADDR=0x400000
> @@ -35,6 +36,7 @@ CONFIG_SPL_BSS_MAX_SIZE=0x2000
>   CONFIG_SPL_STACK_R=y
>   CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
>   CONFIG_SPL_SPI_LOAD=y
> +CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000
>   CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
>   CONFIG_TPL=y
>   CONFIG_CMD_BOOTZ=y