Commit Graph

376 Commits

Author SHA1 Message Date
Joseph Chen
55f592f16a tools: update boot_merger and trust_merger
both of them support "--replace" command:
./boot_merge --replace [legacy prefix path] [new prefix path] [File]
./trust_merge --replace [legacy prefix path] [new prefix path] [File]

Change-Id: Ia6a47d04324b647667ba3c813daec5c5bb43eb86
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-26 19:06:22 +08:00
Kever Yang
5d6d7d43fe Merge branch 'rkbin_171212' into rkbin 2017-12-12 10:56:18 +08:00
Kever Yang
224850510b tools: add tools for merge rkbin
These tools are from tool/ of Rockchip u-boot rkdevelop branch

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2017-12-12 10:52:56 +08:00
Zhaoyifeng
35066a7e04 rk3126: usbplug: add ftl to support firmware upgrade
miniloader commit:358ea2fabadbe18140202f431d1454ca1a96be37

Change-Id: Id1f9a295c51c4927644321a70e0d55e11b837802
Signed-off-by: Zhaoyifeng <zyf@rock-chips.com>
2017-12-08 16:38:30 +08:00
Joseph Chen
2bbd69f869 rk3126: tee: update version to v1.31
build from optee commit:
	cf6a4d8 arm: sm: [bugfix] save/restore fiq core registers

update features:
	fix reboot crash due to fiq data abort in OP-TEE

Change-Id: I09af898ebd74fe69f0fe9e05b2938a32ec4d8858
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-12-06 09:03:16 +08:00
Rimon Xu
ca79b57d01 rk3228h/rk3328: bl32: update version to 1.35
build from optee commit:
	ad4b731 SVP: Fix last commit complile error.

update feature:
	d0af79f SVP: Add an api to copy secure buffer.
	5f837e7 fix compile bug when not define CFG_OTP_SUPPORT
	0d52bd6 syscall: fixed bugs
	8e2704c syscall: add a new syscall interface.

open CFG_TA_DRM configure and delete memblock_enable 3228H

Change-Id: I7e3d8a17fcfe5c0f400daa5d7c7356ce759a6099
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2017-12-01 16:10:54 +08:00
XiaoDong Huang
c1e11d24f3 rk3368h: bl31: update version to v2.18
Build from ATF commit:
    cb7e1a7 plat: rk3368h: add rk3368/rk3368h monitor support
update feature:
    1) cb7e1a7 plat: rk3368h: add rk3368/rk3368h monitor support

Change-Id: I8184a554ce0f4f208a9af36ee8b798ff7267af08
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-30 20:06:18 +08:00
Joseph Chen
491e8878d5 rk3036: support merge trust.img v1.00
build from optee:
	5c621f scripts: optimize the compile script

update featues:
	8272957 plat-rockchip: add rk3036 ddr suspend support
	96831d5 plat-rockchip: add rk3036 support

Change-Id: I76b3826fdda61131158ba26ca97317207d68c2e8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-11-29 10:35:08 +08:00
Rimon Xu
de10a6883f rk322x: tee with ta: update version to 1.91
build from optee commit:
	85c621f scripts: optimize the compile script

update feature:
	02e5569 SVP: Fix last commit complile error.
	8272957 plat-rockchip: add rk3036 ddr suspend support
	81b5bc1 SVP: Add an api to copy secure buffer.
	1e04331 build_optee_os.sh: add rk3036 trust.img package

Change-Id: I35c7650427c9fbaab104e0eb7e908633db87e4e7
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
2017-11-29 10:30:56 +08:00
willam.wei
44713349ef Revert "rk3399: bl32: add rk3399_bl32_tee_ta_DRM_v1.20.bin"
This reverts commit 81ceebdf5a73e2e14facb7ad082032149f81fecd.

The latest bl32 bin has already merged the SVP functions,
so there's no need to use the macro CONFIG_MERGER_TRUSTIMAGE_DRM any more.

Change-Id: I2b87a9591e9ac1711319c155fd37df23f60cbf65
Signed-off-by: willam.wei <willam.wei@rock-chips.com>
2017-11-27 16:56:58 +08:00
Joseph Chen
6e7540622b rk3368: update bl31 to v1.91 for kernel 3.10.
update features:
	48e3101 plat: rk3368: disable fiq debugger when suspend

Change-Id: Ief538bb2e2f715bec274b490d8bf81646f2e4350
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-11-24 18:01:40 +08:00
XiaoDong Huang
cdef8aa284 rk3288: tee: update version to 1.25
Build from optee commit:
    0d867b1 rk3288: suspend: only set arm_int_wkup_en and enable global_int_dis

update features:
    1) 0d867b1 rk3288: suspend: only set arm_int_wkup_en and enable global_int_dis
    2) 60b9e9a plat-rockchip: fix bugs of function "v7_flush_dcache_all"
    3) 2bc8f7b plat-rockchip: rk3288: fix only one ddr channel's bug

Change-Id: Ic88fe4b630f019ff536ce2cb33ed3800141afd22
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-24 15:15:54 +08:00
XiaoDong Huang
16a2c32255 rk3368h: bl31: update version to v2.17
Build from ATF commit:
    1ddeae4 plat: rk3368: sgrf init: idle dma before reset dma
update feature:
    1) 1ddeae4 plat: rk3368: sgrf init: idle dma before reset dma
    2) 2d7a715 plat: rk3368h: suspend: remotectl parse: initialize wakeup_state
    3) 00d1f98 rockchip: set s_el1 FIQ interrupts route to el3 only for rk3368
    4) 8130c6e rockchip: set s_el1 FIQ interrupts route to el3

Change-Id: I95717ce274f71b679550f5243448e3efde61acac
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-23 19:55:01 +08:00
Tang Yun ping
47e297d7e0 rk3036: ddr: ddr init code update to v1.09
Add arch timer(timer5) init for cpu.

form commit:
	2d8d8b2 rk3036: ddr: update ddr code to DDR V1.09 20171120

Change-Id: Ibf207e28476238cc89f73051b51add1fbe886bb7
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-23 10:45:47 +08:00
YouMin Chen
b39e2ed1a2 rk3399: ddr: update ddr init bin v1.09
support only one channel(channel_a) have connect DRAM.

Change-Id: If8941b195113d50324377208ddde24409f5a777f
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2017-11-22 16:59:52 +08:00
Hisping Lin
661397c5d6 rk3126: tee: update tee-pager.bin to v1.30
build from optee commit:
    c49f3d syscall: fixed bugs

update feature for rk3126:
    77b1ba static ta: fix cflag when read and write
    eaed6d static ta: not to creat file when read file.
    993d9b static ta: set flag when uboot jump into kernel.

Change-Id: I5880b5e971fe9d744d7e22c6166ff46c8f1d1234
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2017-11-17 11:44:49 +08:00
XiaoDong Huang
c49e0b9a6e rk322xh: bl31: update version to v1.36
Build from ATF commit:
    0ac3e1a plat: rk322xh: ddr: enable DPLL spread to improve DDR EMI

update features:
    1) 0ac3e1a plat: rk322xh: ddr: enable DPLL spread to improve DDR EMI
    2) 9dc7522 plat: rk322xh: suspend: remotectl parse: initialize wakeup_state

Change-Id: I41d13bfc578b980e25d384d5e6a578e109392e0f
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-15 09:21:06 +08:00
Zhang Zhijie
cdf7f1a2ae rk322x: tee with ta: update optee version to v1.90
build from optee commit:
93e8858 rk322x: update version to 1.9

update features:
60b9e9a plat-rockchip: fix bugs of function "v7_flush_dcache_all"
dd3774b SVP: add seure video path
58cf1f4 rk3228 & rk3288: fix incorrect memblock config
32bbc9a rk3228: add a new static TA
299b44b rk322x: suspend: open mask clks that define in clk_ungt_msk

Change-Id: I055a889be3cb5519da028ae1bb86b0931a62c12f
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-11-15 09:15:15 +08:00
Caesar Wang
23c078284d rk tools: update the RK3036.ini
Update the right usb plug loader for rk303x.

Change-Id: If034c2f7506f7d15685c56371431cc5b37ead6cf
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2017-11-14 13:42:39 +08:00
XiaoDong Huang
db7ea24218 rk3126: tee: update version to v1.29
build from optee commit:
    3ae8dd2 plat: rk312x: suspend: flash all dcache

update feature for rk312x:
    1) plat: rk312x: suspend: flash all dcache
    2) plat-rockchip: fix bugs of function "v7_flush_dcache_all"
    3) plat: rk312x: cpu on/off: support cpu0 on
    4) plat: rk312x: cpu on/off: add affinity_info

Change-Id: Ie10892861c95c7b8d1095ca8fb48a94cfe0b3524
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-11-13 10:04:18 +08:00
Tang Yun ping
2e0f3ca24e rk3128: ddr: ddr init code update to v2.07
Both using grf_os_reg0 and pmu_sys_reg0 for flag into
maskrom device.
from commit:
	6fbb2d5 rk3128: ddr: update to v2.07 20171109

Change-Id: Id52dcd7935fb74975f5713625754b809c5d0db29
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-10 18:39:24 +08:00
Tang Yun ping
1d473dde09 rk3126: ddr: ddr init code update to v2.09
Both using grf_os_reg0 and pmu_sys_reg0 for flag into
maskrom device.
from commit:
	1214cc2 rk3126: update to v2.09 20171109

Change-Id: Ib4ff97be3b2cb2fee3f258f3121148597324a201
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-10 18:39:24 +08:00
Tang Yun ping
1b828e4f78 rk322x/rk3328: ddr: update ddr init code to v1.10
print info: DDR Version 1.10 20171106
This version fix dram type and dram cap possiblity detect incorrect.

from commit: e40ae20 rk322xh: ddr: fix dram training bug

Change-Id: I218049251c7fa052e044ede085fe36aa74c14aee
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-10 18:39:24 +08:00
Hecanyang
74801c95ba rk3288: ddr: update ddr bin to rk3288_ddr_400MHz_v1.06
built from ddr init project commit:
	7c2ce8c version: release version of v1.06

update feature:
1) all ddr3 use 16bit, it can fix hynix DDR3 H5TC4G63CFR die's
   starting up problem, and system stabilize problem.

Change-Id: I61d3410d12b7e924b2cb24cd28a2101fbaf7d49b
Signed-off-by: Hecanyang <hcy@rock-chips.com>
2017-11-09 15:19:48 +08:00
Xuhanrui
4b8b919042 rk3228h/rk3328: bl32: update version to 1.34
built from optee commit: 3ab94b69b600e947cfbf9057bcb11d7a5c14885b

update feature:
3ab94b6 SVP: unified DRM memory allocation from low address
8c020a4 SVP: when vp9 find invalid compressed header, return total size
open CFG_TA_DRM configure and delete memblock_enable 3228H

Change-Id: Id832569e0f68749eb2881dc29233d03113fa6668
Signed-off-by: Xuhanrui <xhr@rock-chips.com>
2017-11-06 08:41:15 +08:00
Jason Song
19633683f2 px5: kernel4.4: use px5 own miniloader v2.62
Change-Id: I6e78033c0fb0f60b5372e446e16182e022c12bed
Signed-off-by: Jason Song <sxj@rock-chips.com>
2017-11-02 11:10:12 +08:00
Zhang Zhijie
93dd10c480 rk3228h/rk3328: bl32: update version to 1.33
built from optee commit: 92701159c9f56d08fadd5d8e3ef4772fc20d1f89

update feature:
9270115 re-code rk_ctit_service
b7becf1
d8b7d58 lib: build BoringSSL into OPTEE
3c028b0 lib: import BoringSSL

Change-Id: I492c2b276393845fd08b0dd768f3fa1c1aa4916e
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-11-01 15:37:55 +08:00
Tang Yun ping
cf93e19631 rk3368: ddr: update ddr init code to V2.02
print info: "DDR Version v2.02 20170731"
This version fix bug of  some dram type/dram bandwidth detect fail.
from commit:
	aef516b rk3368: ddr: update ddr version to v2.02

Change-Id: I16cd5851a70d9a3d13aaa79162737fcf0a4ef7c1
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-01 15:33:29 +08:00
Tang Yun ping
d64203189e rk322x: ddr: update ddr init code to v1.06
print info: "DDR Version V1.06 20171026"
1. add ddr2 init code to support ddr2.
2. fix bug of dram type detect fail.
3. fix bugs of dram bandwidth detect fail and some dram cap detect
fail when dram bandwidth equal to 16bit.
from commit:
	08f6ed3 rk322x: ddr update to v1.06,fix some bugs when bw=16

Change-Id: I45bef1660f25e87a19f587663b8142d3e791af32
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-11-01 15:33:29 +08:00
Zhang Zhijie
614a67ff3f rk3399: bl32: update version to 1.11
built from optee commit: 2d5da6a83a84774c59df3b11ca3b97243c617689

update feature:
2d5da6a rk3399: update version to 1.1
a81a01a rk3399: add seure video path
1bb641d static ta: don't forget to free static ta ctx buffer
fb29684 rpmb: refine rpmb key generate strategy

Change-Id: I7bf769971ae388e8a4efce9ccf3a03773e87572c
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-10-20 09:59:19 +08:00
willam.wei
e673855e59 rk3228h/rk3328: bl32: update version to 1.32
built from optee commit: face623dceba59649815ffb36f32c3a7a0a28948

update feature:
rk3228H: add seure video path
    1)support H264 HEVC VP9 VP8 MPEG2 MPEG4
    2)add decrypt ta and video parser ta
    3)support small vcodec_service, only support set/get region

Change-Id: I7fc600ec46baa579cfaf3d1b10f6646e59a38f23
Signed-off-by: willam.wei <willam.wei@rock-chips.com>
2017-10-18 11:01:22 +08:00
Joseph Chen
cb065e4350 rk3126: tee: update version to v1.28
build from optee commit:
	1997420 plat-rockchip: set CNTVOFF zero when cpu boot up

update feature for rk312x:
	(1) support system reset;
	(2) set CNTVOFF zero when cpu boot up.

Change-Id: I9f9d432df53093de31b40368f3b1b838239d7979
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-10-18 10:50:26 +08:00
XiaoDong Huang
3e8b5dd1b5 rk322xh: bl31: update version to v1.35
Build from ATF commit:
	c9d433e plat: rk322xh: add RK_SIP_VPU_RESET support

Change-Id: Ib3e96a29a718b6fa1f6e63b01175544ca1298d25
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-10-12 15:57:26 +08:00
Tang Yun ping
b3f6a1f50a rk322xh: rk3328: ddr: update ddr to v1.09 20171011
1. fix 1cs 4GB bug about address overflow.
2. enable dfi_lp_en_pd and hw_lp_idle_x32.
from commit:
	94bd928 version:  v1.09 20171011

Change-Id: I660a7455c34c99e6251067f48b9f99f2a8e33c72
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-10-11 17:24:50 +08:00
Jason Song
fd1b85abbd px5: add init config for px5 kernel4.4
compile cmd:

make px5_kernel4.4_defconfig
make ARCHV=aarch64

ini, must modify this two file:

tools/rk_tools/RKBOOT/PX5KERNEL4.4MINIALL.ini
tools/rk_tools/RKTRUST/PX5KERNEL4.4TRUST.ini

Change-Id: Ib0c4f0885a895d005a42a723ff6aabe7023bc767
Signed-off-by: Jason Song <sxj@rock-chips.com>
2017-10-11 09:32:27 +08:00
shengfei Xu
2e263d060e rk3288: tee: update version to 1.24
build from optee commit: 6d63b1c2711826d33d958dcc19c00205ce172d15

update features: fix the system clock error

Change-Id: Ie497545d5498e9e2c6cd2a1d75a641deab70c030
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-09-12 09:18:51 +08:00
XiaoDong Huang
c3aa318c21 rk3368h: bl31: update version to v2.16
Build from ATF commit:
	750ad69 plat: rk3368h: suspend: support remotectl parse and filter

update feature:
	1) 750ad69 plat: rk3368h: suspend: support remotectl parse and filter
	2) b282f92 plat: rk3368h: report detailed wakeup source when resume

Change-Id: I379c3aaf3c351e59853182ff75f2a015e8656781
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2017-09-08 15:46:02 +08:00
shengfei Xu
f8e3881fb7 rk3288: tee: update version to 1.23
build from optee commit: decbfaf1239a2d3452547fab6283e6d4adcdedde

update features:
1. support the suspend clock switch to 32k
2. fix bug for DDR3 DRAM side ODT disable

Change-Id: Ic4f492553e840f17c8a6066a60265aadd42d9398
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-09-05 11:34:21 +08:00
willam.wei
b8f69f4f65 rk3399: bl32: add rk3399_bl32_tee_ta_DRM_v1.20.bin
build from optee_os commit 438e3f7852917523e869334fba675c1f7fabf078
update features:
1.  if #define CONFIG_MERGER_TRUSTIMAGE_DRM
    the file "rk3399_bl32_tee_ta_DRM_v1.20.bin"
    will be packed in trust.img

Change-Id: Ie4c698ef7ec4836b22618b6a9a7979b80d7e23a3
Signed-off-by: willam.wei <willam.wei@rock-chips.com>
2017-09-04 11:41:57 +08:00
Joseph Chen
b05e932d1d rk3368: fix chip name dump for kernel4.4 box product
chip name uses "RK3368".

Change-Id: I216d1cedfc43c4f48855e13f4e116c9020180f97
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-08-16 10:04:22 +08:00
shengfei Xu
bf9bee42f9 rk3288: tee: update version to 1.22
build from optee commit: 897ad0f2e06e5d5dd87738d446f7eceb4f5e22fb

update features: add interface to read/write efuse

Change-Id: I8fe888f619c50b17c02c76515231909d7010e5ea
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-08-08 16:05:09 +08:00
Joseph Chen
968dc507c1 rk322x: tee with ta: update optee version to v1.81
build from optee commit:
	50b9b79 rk322x: add system off by pull up rk805 sleep pin

Change-Id: I5ea9dd054879d0e0bded28b923fffa994dab9075
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-08-01 09:29:39 +08:00
Zhang Zhijie
f6d14402d5 rk322x: tee: update tee_ta version to 1.8
build from optee commit: 54c8431a01b4cf7452aeb1ff33af0dfbd2573e82

update features:
1.rpmb: refine rpmb key generate strategy
2.storage: add OTP_SUPPORT and BCH_SUPPORT
3.sta: add a new static TA for secure storage
4.crypto: enable CFG_RK_CRYPTO_BORINGSSL

Change-Id: Ide4a2fa672621f2f1e60b62335b025ab9aa6870c
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-08-01 09:26:02 +08:00
shengfei Xu
38a12f763d rk3399: bl31: update version to v1.12
built from optee commit: 9f93abc55b1db63da07237f87db75e2c27620384

update features:
     1.Ensure DPLL match dpll_rates_table
     2.fix the error about qos save/restore

Change-Id: Ibecbf9402786153269b757b3df20c6d5c6bb1024
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
2017-07-27 10:52:12 +08:00
Joseph Chen
b8228e6d33 rockchip: add rk3368_box_kernel4.4_defconfig
Change-Id: I6ba5526945c2785557c2512a0d354a5b44e5b22b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-07-20 09:31:15 +08:00
Joseph Chen
72a7cbb9fa RK3368MINIALL: reanme output loader name 'rk3368h' to 'rk3368'
Change-Id: I2684f8006255b4864a0f69082b4a6a30b7c5973c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2017-07-20 09:28:00 +08:00
Hecanyang
dfe94b5140 rk3288: ddr: update ddr bin to rk3288_ddr_400MHz_v1.05
built from ddr init project commit:
	49df872 version: DDR Version 1.05 20170712

update feature:
1) fix customer DDR3 3GB with
   channel a: col=10, row=16, cs=1, size = 2048MB
   channel b: col=10, row=15, cs=1, size = 1024MB
2) support all 3GB and 1.5GB setting with DDR3
   512Mx16bit and LPDDR3 single die with 8Gb case.
   these rarely type of die was not consider before.

Change-Id: Ibdb5d758cc622a72672faff7069bd5efa85ce2e4
Signed-off-by: Hecanyang <hcy@rock-chips.com>
2017-07-13 08:51:21 +08:00
Zhang Zhijie
f85aa2aa48 rk3399: bl32: update version to 1.10
built from optee commit: 111b3c59241578aa3240af90b598453c8ac8951c

update feature:
111b3c5 UPSTREAM: plat-rockchip: respond foreign interrupt for GICv3
1de8e35 rk3399: fix the driver of the efuse
0432bec rk3399: remove device master and slave init
9708ae3 rk3399: add error correcting code
eae3e59 rk3399: add driver of efuse

Change-Id: Ie87771b6af3232b8f2036c516975dd573b38a610
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
2017-07-10 08:54:22 +08:00
Tang Yun ping
4ff7302e85 rk3126: ddr: update ddr bin version to V2.08 20170619
from commit:
	a955e48 rk3126b/c: ddr: fix sdcard boot bug

Change-Id: I7eaa4271e0321808383e7a1b03334c3211d77b34
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2017-07-04 17:56:27 +08:00
sean.huang
ed2ba9f933 rk3228h/rk3328: bl32: update version to 1.31
built from optee commit: 5cdf8deaa939a2cf23b1a20bbfd5460c93873404

update feature:
1)check mac/sn/stid's position has been writeen
2)add error correcting code

Change-Id: Ib436a55eb5a0c8f51158382155a8f0b4eef53da0
Signed-off-by: sean.huang <sean.huang@rock-chips.com>
2017-07-03 09:34:50 +08:00