diff --git a/config/sources/families/rk322x.conf b/config/sources/families/rk322x.conf index df304d3dfe..774d231021 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:v2020.07' +BOOTBRANCH='tag:v2020.10' 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 4f03a08c2f..067697c6a9 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,6 +1,6 @@ diff --git a/configs/rk322x-box_defconfig b/configs/rk322x-box_defconfig new file mode 100644 -index 00000000..950f122f +index 00000000..e4177588 --- /dev/null +++ b/configs/rk322x-box_defconfig @@ -0,0 +1,111 @@ @@ -8,6 +8,7 @@ index 00000000..950f122f +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_TEXT_BASE=0x61000000 +CONFIG_SYS_MALLOC_F_LEN=0x2000 ++CONFIG_SPL_TEXT_BASE=0x60000000 +CONFIG_ROCKCHIP_RK322X=y +CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 @@ -19,14 +20,13 @@ index 00000000..950f122f +CONFIG_DEBUG_UART_BASE=0x11030000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART=y -+CONFIG_SPL_TEXT_BASE=0x60000000 +CONFIG_LOCALVERSION="-armbian" +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y -+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh" ++CONFIG_SPL_FIT_SOURCE="board/rockchip/rk322x-box/rk322x-box.its" +CONFIG_SD_BOOT=y +CONFIG_BOOTDELAY=0 +CONFIG_USE_PREBOOT=y diff --git a/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-its.patch b/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-its.patch new file mode 100644 index 0000000000..8d7a793aee --- /dev/null +++ b/patch/u-boot/u-boot-rk322x/board_rk322x-box/rk322x-box-add-its.patch @@ -0,0 +1,56 @@ +diff --git a/board/rockchip/rk322x-box.its b/board/rockchip/rk322x-box/rk322x-box.its +new file mode 100644 +index 00000000..a5824c61 +--- /dev/null ++++ b/board/rockchip/rk322x-box/rk322x-box.its +@@ -0,0 +1,50 @@ ++/* ++ * Copyright (C) 2017-2019 Rockchip Electronic Co.,Ltd ++ * ++ * Simple U-boot FIT source file containing U-Boot, dtb and optee ++ */ ++ ++/dts-v1/; ++ ++/ { ++ description = "FIT image with OP-TEE support"; ++ #address-cells = <1>; ++ ++ images { ++ uboot { ++ description = "U-Boot"; ++ data = /incbin/("u-boot-nodtb.bin"); ++ type = "standalone"; ++ os = "U-Boot"; ++ arch = "arm"; ++ compression = "none"; ++ load = <0x61000000>; ++ }; ++ optee { ++ description = "OP-TEE"; ++ data = /incbin/("../../../../packages/blobs/rockchip/rk322x_tee.bin"); ++ type = "firmware"; ++ arch = "arm"; ++ os = "tee"; ++ compression = "none"; ++ load = <0x68400000>; ++ entry = <0x68400000>; ++ }; ++ fdt { ++ description = "rk322x-box"; ++ data = /incbin/("arch/arm/dts/rk322x-box.dtb"); ++ type = "flat_dt"; ++ compression = "none"; ++ }; ++ }; ++ ++ configurations { ++ default = "conf"; ++ conf { ++ description = "rk322x-box"; ++ firmware = "optee"; ++ loadables = "uboot"; ++ fdt = "fdt"; ++ }; ++ }; ++}; diff --git a/patch/u-boot/u-boot-rk322x/fix-tee-path.patch b/patch/u-boot/u-boot-rk322x/fix-tee-path.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rk322x/fix-tee-path.patch rename to patch/u-boot/u-boot-rk322x/fix-tee-path.patch.disabled diff --git a/patch/u-boot/u-boot-rk322x/u-boot-1000-rockchip.patch b/patch/u-boot/u-boot-rk322x/u-boot-1000-rockchip.patch index 847ec67b9f..692a7afeb2 100644 --- a/patch/u-boot/u-boot-rk322x/u-boot-1000-rockchip.patch +++ b/patch/u-boot/u-boot-rk322x/u-boot-1000-rockchip.patch @@ -383,14 +383,6 @@ diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 6b302e987c..3c0b82df1c 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig -@@ -32,6 +32,7 @@ CONFIG_CMD_TIME=y - CONFIG_SPL_OF_CONTROL=y - CONFIG_TPL_OF_CONTROL=y - CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" -+CONFIG_MISC_INIT_R=y - CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" - CONFIG_ENV_IS_IN_MMC=y - CONFIG_SYS_RELOC_GD_ENV_ADDR=y @@ -49,6 +50,8 @@ CONFIG_FASTBOOT_BUF_SIZE=0x04000000 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y @@ -400,6 +392,11 @@ index 6b302e987c..3c0b82df1c 100644 CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MTD=y +@@ -68,3 +68,4 @@ CONFIG_USB_GADGET=y + CONFIG_USB_GADGET_DWC2_OTG=y + CONFIG_TPL_TINY_MEMSET=y + CONFIG_ERRNO_STR=y ++CONFIG_MISC_INIT_R=y diff --git a/drivers/misc/rockchip-efuse.c b/drivers/misc/rockchip-efuse.c index f2d362ce..2aa9373f 100644 --- a/drivers/misc/rockchip-efuse.c diff --git a/patch/u-boot/u-boot-rk322x/u-boot-1002-rockchip-sdram-rk322x-fix-dram-bank-size-calculation.patch b/patch/u-boot/u-boot-rk322x/u-boot-1002-rockchip-sdram-rk322x-fix-dram-bank-size-calculation.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rk322x/u-boot-1002-rockchip-sdram-rk322x-fix-dram-bank-size-calculation.patch rename to patch/u-boot/u-boot-rk322x/u-boot-1002-rockchip-sdram-rk322x-fix-dram-bank-size-calculation.patch.disabled