From 5d68d4a68e58b402bbf9c14532a27bea241adaa5 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Wed, 7 Oct 2020 21:16:06 +0200 Subject: [PATCH] Reserve last 32KiB for environment in SPI for ROCK Pi 4 --- config/sources/families/include/rockchip64_common.inc | 2 +- .../board-rock-pi-4-enable-spi-flash.patch | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 22ff067b6..7ec139974 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -167,7 +167,7 @@ uboot_custom_postprocess() if [[ $BOOT_SUPPORT_SPI == yes ]]; then tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin rkspi_tpl_spl.img - dd if=/dev/zero of=rkspi_loader.img count=8192 status=none + dd if=/dev/zero of=rkspi_loader.img count=8128 status=none dd if=rkspi_tpl_spl.img of=rkspi_loader.img conv=notrunc status=none dd if=u-boot.itb of=rkspi_loader.img seek=768 conv=notrunc status=none fi diff --git a/patch/u-boot/u-boot-rockchip64-mainline/board-rock-pi-4-enable-spi-flash.patch b/patch/u-boot/u-boot-rockchip64-mainline/board-rock-pi-4-enable-spi-flash.patch index b37aca00b..e1708e46a 100644 --- a/patch/u-boot/u-boot-rockchip64-mainline/board-rock-pi-4-enable-spi-flash.patch +++ b/patch/u-boot/u-boot-rockchip64-mainline/board-rock-pi-4-enable-spi-flash.patch @@ -44,9 +44,8 @@ index 8b34198a..1a5cd77d 100644 CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 --CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_OFFSET=0x3FA000 +CONFIG_ENV_SIZE=0x6000 + CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y @@ -99,9 +98,8 @@ index 8b34198a..1a5cd77d 100644 CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 --CONFIG_ENV_OFFSET=0x3F8000 -+CONFIG_ENV_OFFSET=0x3FA000 +CONFIG_ENV_SIZE=0x6000 + CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_EVB_RK3399=y