From 71d6e7db63d6d85b7b1374b37432e0e8dcd3a73a Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 12 Feb 2022 19:42:36 +0000 Subject: [PATCH] rk322x: bump to u-boot v2022.01 --- config/sources/families/rk322x.conf | 2 +- .../rk322x-box-add-defconfig.patch | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index 267261d9ca..fa5be08e57 100644 --- a/config/sources/families/rk322x.conf +++ b/config/sources/families/rk322x.conf @@ -3,7 +3,7 @@ BOOTENV_FILE='rk322x.txt' OVERLAY_PREFIX='rk322x' UBOOT_TARGET_MAP="all u-boot.itb;;u-boot-rk322x-with-spl.bin" BOOTDELAY=0 -BOOTBRANCH='tag:v2021.07' +BOOTBRANCH='tag:v2022.01' ARCH=armhf SERIALCON=ttyS2 diff --git a/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-defconfig.patch b/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-defconfig.patch index 9d8b3f064d..6eee5b5ff7 100644 --- a/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-defconfig.patch +++ b/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-defconfig.patch @@ -1,28 +1,29 @@ diff --git a/configs/rk322x-box_defconfig b/configs/rk322x-box_defconfig new file mode 100644 -index 0000000000..961dabb0e2 +index 00000000..6c5755e3 --- /dev/null +++ b/configs/rk322x-box_defconfig -@@ -0,0 +1,112 @@ +@@ -0,0 +1,110 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x61000000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_NR_DRAM_BANKS=2 ++CONFIG_DEFAULT_DEVICE_TREE="rk322x-box" +CONFIG_SPL_TEXT_BASE=0x60000000 +CONFIG_ROCKCHIP_RK322X=y +CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 -+CONFIG_SPL_MMC_SUPPORT=y ++CONFIG_SPL_MMC=y +CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" +CONFIG_TARGET_RK322X_BOX=y +CONFIG_SPL_STACK_R_ADDR=0x60600000 +CONFIG_DEBUG_UART_BASE=0x11030000 +CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEFAULT_DEVICE_TREE="rk322x-box" +CONFIG_DEBUG_UART=y +CONFIG_LOCALVERSION="-armbian" +# CONFIG_LOCALVERSION_AUTO is not set ++CONFIG_SYS_LOAD_ADDR=0x63000000 +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y @@ -41,7 +42,7 @@ index 0000000000..961dabb0e2 +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x8000 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 -+CONFIG_SPL_OPTEE=y ++CONFIG_SPL_OPTEE_IMAGE=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y @@ -112,7 +113,4 @@ index 0000000000..961dabb0e2 +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_OPTEE_LOAD_ADDR=0x68400000 -+CONFIG_OPTEE_TZDRAM_SIZE=0x00200000 -+CONFIG_OPTEE_TZDRAM_BASE=0x68400000 +CONFIG_BOOTM_OPTEE=y