Commit Graph

391 Commits

Author SHA1 Message Date
XiaoDong Huang
8317e5d209 px30: bl31: update version to v1.04
Build from ATF commit:
    3755b82 plat: px30: dram: deliver ch.rank to PARAM_DRAM_RANK
update feature:
    3755b82 plat: px30: dram: deliver ch.rank to PARAM_DRAM_RANK
    5660b1b plat: px30: suspend: fix pvtm's freq calculation problem
    67bdd60 plat: px30: fix CRU_PMU_CLKGATE addr err
    75b3892 plat: px30: ddr add ddr scale frequency

Change-Id: I59c550f0486bcbc4db79e2dd84b4e83a2d783892
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-09 16:06:21 +08:00
XiaoDong Huang
be0214cd7c rk3326: bl31: update version to v1.04
Build from ATF commit:
    3755b82 plat: px30: dram: deliver ch.rank to PARAM_DRAM_RANK
update feature:
    3755b82 plat: px30: dram: deliver ch.rank to PARAM_DRAM_RANK
    5660b1b plat: px30: suspend: fix pvtm's freq calculation problem
    67bdd60 plat: px30: fix CRU_PMU_CLKGATE addr err
    75b3892 plat: px30: ddr add ddr scale frequency

Change-Id: I4b30c10d65fb0b0cd6d2058b04d7785bdc3dd169
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-09 15:55:51 +08:00
Hisping Lin
5297cdd415 rk3326: bl32: update version to v1.01
build from optee commit:
    1a63fd  rk3326: enable CFG_RK_UBOOT_STORE := y

update features:
    81a664 pta: fix bug when open file fail
    6bb66 rk3326: read non-secure otp data without ecc

Change-Id: Ifa9a036b148188d51e4f83aa57e990a02cd473ea
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2018-03-09 09:23:21 +08:00
Hisping Lin
b2343bf4ce px30: bl32: update version to v1.01
build from optee commit:
    1a63fd  rk3326: enable CFG_RK_UBOOT_STORE := y

update features:
    81a664 pta: fix bug when open file fail
    6bb66 rk3326: read non-secure otp data without ecc

Change-Id: If5f570717e9b7e82e0ca0d23a97a8e09cb799b33
Signed-off-by: Hisping Lin <hisping.lin@rock-chips.com>
2018-03-09 09:20:47 +08:00
XiaoDong Huang
c88a2c32a7 rk3326: bl31: update version to v1.03
Build from ATF commit:
    7c6a86f plat: px30: rename PX30 to px30
update feature:
    7c6a86f plat: px30: rename PX30 to px30
    7352790 plat: PX30: pmu init: do remap after nonboot_cpus_off

Change-Id: I62056f8af4196f163dff0a2e026cfc416486bf9f
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-01 12:14:36 +08:00
XiaoDong Huang
540d927fc7 px30: bl31: update version to v1.03
Build from ATF commit:
    7c6a86f plat: px30: rename PX30 to px30
update feature:
    7c6a86f plat: px30: rename PX30 to px30
    7352790 plat: PX30: pmu init: do remap after nonboot_cpus_off

Change-Id: Ia41b2ad5851185be87b427560f839399d625fc2a
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-03-01 12:13:55 +08:00
chenfen
c150b31ad5 PX30: miniloader: disable some features
from commit: 800031 disable some feutures

Change-Id: Ie26712470a0dac22346338f313eeae0960251222
Signed-off-by: chenfen <chenfen@rock-chips.com>
2018-02-28 18:31:59 +08:00
XiaoDong Huang
55d8f23f5d rk3326: px30: bl31: update version to v1.02
Build from ATF commit:
    bce5955 plat: rockchip: add rk3326 support
update feature:
    1) bce5955 plat: rockchip: add rk3326 support
    2) 11d032b rockchip: pmu sram: support cpu warm boot from pmu sram

Change-Id: Ieb28e226aeca5652d9d92cb9bac2525922924642
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-02-28 09:26:10 +08:00
chenfen
0871095906 rk3326: miniloader: disable some features.
form commit: 800031 disbale some features.

Change-Id: I2fe122c29a12e45273ea2469080ad6aaf7c2853e
Signed-off-by: chenfen <chenfen@rock-chips.com>
2018-02-27 17:26:35 +08:00
Joseph Chen
161e21af9b px30: add PX30 package support
Change-Id: Ieccd17302eeed06fd241314eb60cf55b84d106ee
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-27 17:01:27 +08:00
Joseph Chen
d9992da4c4 RK3326: ini: remove unused prefix path "tools/rk_tools/"
"tools/rk_tools/" is leagcy path from rkdevelop

Change-Id: I8fbfd7cfad5c09d274fef50ec6b6b49dadd84ea8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-27 16:48:02 +08:00
Tang Yun ping
9b753bf0fe rk3326: DDR init code update to V1.03
Set cpu priority to 1
print info: DDR Version 1.03 20180211
from commit: 290289b rk3326: ddr update to v1.03

Change-Id: Ib535823ea4abd59eface6f5fa0031f4980e36a03
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
2018-02-26 14:36:56 +08:00
XiaoDong Huang
7b5c6679cb rk3326: bl31: update version to v1.01
Build from ATF commit:
    c118a9b TEST-ONLY: plat: rk3326: ddr add ddr scale frequency
update feature:
    c118a9b TEST-ONLY: plat: rk3326: ddr add ddr scale frequency
    6d53cd7 plat: rockchip: add rk3326 support

Change-Id: I4de1028ecf1990225ca3eb795f0ff04dab0ee361
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2018-02-23 15:41:55 +08:00
Joseph Chen
2163c404ed rk3326: support pack trust and loader
Change-Id: I1d788f929a905e2e54dd9677ec66a40a8ec426fb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-11 15:45:13 +08:00
Joseph Chen
27a7fb595b tools: update resource_tool to support "--root" command
Change-Id: I313e35ac62f236864afc4761c13810eb25b7ec0a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-27 14:13:00 +08:00
Joseph Chen
595d4ef709 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
823f8bf485 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
0c551a3041 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
2ac2a19992 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
00d9f45f34 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
2a80f0e92e 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
b9396af266 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
6ddac0112e 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
ffd007d05b 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
b57de1fb5a 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
2c5495c697 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
5f0b8b06a0 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
7868b2cc4d 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
72face48fe 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
fe45b656e7 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
4c403efeef 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
facb613c66 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
7fde50bff7 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
8b62de7fe3 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
37201eca58 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
34514f3bb2 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
48e179ec08 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
277648c512 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
c03efcb492 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
add64ce3e1 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
debf257137 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
e6440db9a5 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
1fe0bf638e 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
f69fc950ec 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
00772aa2ed 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
e284b62295 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
06ede81031 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
186b2d5dd6 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
9bebe9ab48 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