Merge branch 'rkbin_171212' into rkbin

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-rockch

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>

show more ...

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"

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>

show more ...

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-of

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>

show more ...

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

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>

show more ...

rk322x: tee: update optee with ta version to v1.71

build from optee commit : ffd6ec

update features:
(1)rk3228: init: don't setup default nsec shm with non-TA img
(2)rockchip: system suspend: disab

rk322x: tee: update optee with ta version to v1.71

build from optee commit : ffd6ec

update features:
(1)rk3228: init: don't setup default nsec shm with non-TA img
(2)rockchip: system suspend: disable fiq_debugger

Change-Id: Id1cba2b40d4be9094db966aff2e5d0d1ce4ff0d6
Signed-off-by: hisping <hisping.lin@rock-chips.com>

show more ...

rk322x: tee: update optee with ta version to v1.70

build from optee commit: f23c4e0

update features:
(1) support system reset;
(2) fix rk3229 crash.

support generate both trust.img and trust_with_

rk322x: tee: update optee with ta version to v1.70

build from optee commit: f23c4e0

update features:
(1) support system reset;
(2) fix rk3229 crash.

support generate both trust.img and trust_with_ta.img

Change-Id: I06e808e5b14a0b83a5d412f8c66688451e92f62e
Signed-off-by: chenjh <chenjh@rock-chips.com>

show more ...

RK322x: Trust: update optee version to v1.90

Change-Id: I1f7c6dbbff7b75058e466cab3feb08dcd8584aeb
Signed-off-by: Tang Yun ping <typ@rock-chips.com>

RK322x: Trust: update optee version to v1.80

Change-Id: I2906bd8a399498dd3745c9d79e2e5fc9f83a4476
Signed-off-by: chenjh <chenjh@rock-chips.com>

RKBOOT/RKTRUST: rename the bin and ini files in rk_tools to a standard

1. Files to be merged in rk_tools should rename as format:
[chip]_[module]_[feature]_[version].[postfix]
such as "rk

RKBOOT/RKTRUST: rename the bin and ini files in rk_tools to a standard

1. Files to be merged in rk_tools should rename as format:
[chip]_[module]_[feature]_[version].[postfix]
such as "rk322xh_ddr3_800MHz_v1.00.bin"
2. Output two-level loader, format such as "rk322xh_loader_v1.00.238.bin",
v1.00.238 means its ddr version is v1.06, and miniloader version is v2.38.
3. As for output one-level loader, format such as "rk3288_bootloader_v1.01.bin",
v1.01 means its ddr version is v1.01.

Change-Id: Ia492b9c76e2396ff246585d5fbbb34c248b55044
Signed-off-by: William Zhang <william.zhang@rock-chips.com>

show more ...

K322X: optee: update optee with trust app version to v1.6

increase rk322x_tee_ta_v1.6.bin for with ta in rk3229

Change-Id: I657ae3016b165ab59a6e54c409b216797a8c8961
Signed-off-by: sean.huang <sean.

K322X: optee: update optee with trust app version to v1.6

increase rk322x_tee_ta_v1.6.bin for with ta in rk3229

Change-Id: I657ae3016b165ab59a6e54c409b216797a8c8961
Signed-off-by: sean.huang <sean.huang@rock-chips.com>

show more ...

RK322x: Trust: update optee version to v1.7

Change-Id: Ibb25f282614960fccdfb635ba7e8d6e12b1d1601
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

RK322x: Trust: update optee version to v1.6

fix some system suspend/resume issues

Change-Id: I0c67ed58398c9c189e54be7a32ca2dd11a632c38
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

RK322x: Trust: update optee version to v1.5

sleep: add pmic_sleep pin control for pmic

Change-Id: Ib65c99f28e804acee4c187efac9558c3f8a7892a
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

optee : revert version to v1.4

1) Revert rk322x_tee_v1.5.bin to rk322x_tee_v1.4.bin

Change-Id: Iee51984b3cf99c43e99ba64f187ed6a230ba3227
Signed-off-by: csx <csx@rock-chips.com>

rk tee : increase new tee.bin and change version

1) increase tee_ta_v1.5.bin for with ta
2) change version number to v1.5

Change-Id: I2b793b30a6282c0842a909908dfc709eddd8f567
Signed-off-by:

rk tee : increase new tee.bin and change version

1) increase tee_ta_v1.5.bin for with ta
2) change version number to v1.5

Change-Id: I2b793b30a6282c0842a909908dfc709eddd8f567
Signed-off-by: csx <csx@rock-chips.com>

show more ...

RK322x: optee: update optee version to v1.4

fix dpll setting refdiv to 1 for more stabilization.

Change-Id: I41a38be1bcd101d30d0188377aa3197e1c5c58f1
Signed-off-by: Tang Yun ping <typ@rock-chips.co

RK322x: optee: update optee version to v1.4

fix dpll setting refdiv to 1 for more stabilization.

Change-Id: I41a38be1bcd101d30d0188377aa3197e1c5c58f1
Signed-off-by: Tang Yun ping <typ@rock-chips.com>

show more ...

RK322x: Trust: update optee version to v1.3

ddr: 1. add ddr change freq function
ddr: 2. optimizing ddr3 timing trfc and tzqcsi, lpddr2 timing trcd and trp.

Change-Id: Ifa0fc4f14fffe487a45eade8ed9f

RK322x: Trust: update optee version to v1.3

ddr: 1. add ddr change freq function
ddr: 2. optimizing ddr3 timing trfc and tzqcsi, lpddr2 timing trcd and trp.

Change-Id: Ifa0fc4f14fffe487a45eade8ed9f294988167bad
Signed-off-by: Tang Yun ping <typ@rock-chips.com>

show more ...

rk322x: update optee version to v1.2

ddr: to reduce EMI, setting refdiv from 1 to 12 for bigger clock jitter

Change-Id: Iabf59d9f211b43af76d1e0b13e2bfd531dd4a7c7
Signed-off-by: Jianhong Chen <chenj

rk322x: update optee version to v1.2

ddr: to reduce EMI, setting refdiv from 1 to 12 for bigger clock jitter

Change-Id: Iabf59d9f211b43af76d1e0b13e2bfd531dd4a7c7
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

show more ...

rk322x: update optee version to v1.1

Change-Id: Id5fe67248c32dba3495d5c75e244791ba55415d1
Signed-off-by: Jianhong Chen <chenjh@rock-chips.com>

rk322x: enable trust os image merge.

1. trust os image merger depend on CONFIG_MERGER_TRUSTOS.
2. loaderimage tools add function merger uboot and trust image.
3. tos bin file config by R

rk322x: enable trust os image merge.

1. trust os image merger depend on CONFIG_MERGER_TRUSTOS.
2. loaderimage tools add function merger uboot and trust image.
3. tos bin file config by RK322XTOS.ini.

Change-Id: I6b47c506bf0bbe8b8db81cca9af047577efc0714
Signed-off-by: cwz <cwz@rock-chips.com>

show more ...