36c668870e
cmd: bootuimage: update return code
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9bd10b448b409fe9e74c7b4c56f5ec7ec3cd4a85
2020-04-10 10:22:08 +08:00
b72261dd0f
cmd: bootfit: update return code
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icaa55c9a7be873d413e91d742bbedecb707447a1
2020-04-10 10:22:08 +08:00
b9e68cc3b8
rockchip: Kconfig: add option to choose fit image pack
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6551be3357ef55d789a4cf90d02d2224041b893d
2020-04-09 18:31:35 +08:00
03fd0d5bb1
rockchip: board: implement write rollback index
...
Exactly before jumping to linux.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ieb133c0ea6b9a3b4f1337348efa8865c60dc8586
2020-04-09 18:26:22 +08:00
4181c9fa95
include: image: add rollback_index
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2f7f222e7453fb16598e3fabb861962c0600709f
2020-04-09 18:26:22 +08:00
e1aab64013
lib: efi: fix compile error
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2a1ee3b81eb20038f6723a205a871d43d8cb71a2
2020-04-09 18:26:22 +08:00
a6b5d4953b
arm: add bootm_headers_t args for announce_and_cleanup()
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8b709ffa378d2a802e9e9daf192c662af5588161
2020-04-09 18:26:22 +08:00
6afcbf8807
rockchip: spl: implment write rollback-index
...
Exactly before jumping the next stage.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib81891ddad474911c0334bb9a370acdcd91603f8
2020-04-09 18:26:22 +08:00
7a1370759d
fit: add rollback index protect support
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3af0049532d7b34adadbbb1faf6c54aad6232f93
2020-04-09 18:26:22 +08:00
83c56efb3c
Kconfig: fit: add configure for rollback-index protection
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I15caa12aa15b48e805f8aa42411bd258a3a66f7f
2020-04-09 18:26:22 +08:00
f8ca9d164a
spl: do cleanup before jumping to next stage
...
Cache/mmu/interrupt cleanup is recommand before jumping to
next stage to avoid some uncertain things.
Provide a arch/board-specific callback to do cleanup things.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic5e4e378ec9080e7af283741370bcd9c2dc897dc
2020-04-09 18:26:22 +08:00
91205f1d2f
make.sh: fix return result code is not 0 when build success
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I27065f6902ab522eba9444ed7771871878787d31
2020-04-09 11:58:44 +08:00
4ef4c8bf6e
spl: rkfw: goto boot next stage directly if find used uboot
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ia32663b91e1360bc491f1db364900eb5b27892f9
2020-04-08 19:09:09 +08:00
aa8ddc585d
make.sh: support/fix fit image pack
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iee11cbb3c77aff339bb99e4f20f80d31adc08174
2020-04-08 15:35:32 +08:00
db3b6a9274
make.sh: itb: support spl fit source/generator
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I322343bf65f8536a8a022516c2b53978859ffcc1
2020-04-08 14:21:57 +08:00
aa415ed977
common: spl: fix cherry-pick sync conflict
...
fixes: (1cb393f
2020-04-07 21:00:48 +08:00
6ba9d88bbb
fit: drop images->verify condition from verify process
...
fit verify process should not depend on this condition, because
it's set by env variable "verify" which maybe can be updated by
fw_setenv tool in userspace.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibcce0d388de64f3809e5e302d1c5cffc01e6c290
2020-04-07 19:35:27 +08:00
0583701d19
make.sh: refactor select_chip_info() and fixup_platform_configure()
...
Make the code generic and providing tables to fill what we want.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I03f3d68fbe1d0d69ea0f82897bfbbf176ee9cd04
2020-04-07 19:35:27 +08:00
02a05e9b64
rockchip: make_fit_optee.sh: support TEE_OFFSET arg from outside
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id25bbf2031ec0a2ee5c8692ad15359ef39131baf
2020-04-07 19:35:27 +08:00
5b7cca2ee0
make.sh: fix typo
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I812c619874daac186704f8f77d8b113ab272339e
2020-04-07 17:48:09 +08:00
568848617e
common: spl: set default address for entry_point_os
...
Could be override in boot_from_devices().
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifbfac5903ec61e65739732949f9e6b8a2704155d
(cherry picked from commit f8ca32e1ca
2020-04-07 17:47:16 +08:00
605bf846bd
common: spl: jump next process depend on entry_point_os
...
The spl can bring up uboot & kernel, and their entry points are diffirent,
so pass their entry points by entry_point_os.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I625d135d219cfbfb620ff1e3d0de5278143f4079
(cherry picked from commit 78628ac9a9
2020-04-07 17:47:16 +08:00
1cb393f1c8
common: spl: rkfw: support bing-up arm32 firmware
...
1. the arm32 trust firmware is diffirent with arm64, support it.
2. add entry_point_os to indicate the uboot or kernel entry point.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I24d1601323e99f40e81d18f1937f762b2ecc137f
(cherry picked from commit a64fd729d4
2020-04-07 17:47:16 +08:00
5d2498f1da
pinctrl: rockchip: support mux route flags
...
Create a new flag to indicate mux route is from topgrf or pmugrf.
* INVALID: means do not need to set mux route
* DEFAULT: means same regmap as pin iomux
* TOPGRF: means mux route setting in topgrf
* PMUGRF: means mux route setting in pmugrf
Change-Id: I1620054f1af915b9495e16b2d10a3f9cf9fd5980
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-04-07 14:26:24 +08:00
162cc77ecd
make.sh: support pack uboot.fit
...
uboot.fit = u-boot-nodtb.bin + u-boot.dtb + tee.bin
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I70ed43fa2ff37d3f9ac0dfef1321a9397901c73f
2020-04-07 12:59:44 +08:00
d13b75e130
make.sh: itb: call raw command to build 32-bit platform itb file
...
We need pass TEE_OFFSET to its file.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8e59ad98c6b54535686a158a6c31e408fc59e7b0
2020-04-07 12:59:27 +08:00
100444810c
configs: rk1808: delete CONFIG_RKFW_U_BOOT_SECTOR
...
Use the default address in the Kconfig.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ic1579b8bf64ffc2bf94be5bb7e7041a1b36c6e89
2020-04-04 10:55:58 +08:00
f37fcb5201
rockchip: dts: rk1808: add node to spl
...
Add adc-keys & vcc_phy.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I868eafb889850edaa88e4423620c02167c1b9030
2020-04-04 10:55:58 +08:00
3732e2b8b1
clk: rockchip: rk1808: enable saradc in spl
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iaf91ec37624b3cd2dd7328ae8eb082236a40f83e
2020-04-04 10:55:58 +08:00
fcb65c6194
spl: rkfw: support bring up different next stage
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Idfca034d4d3eb5a4f757678e62efd7765bf89840
2020-04-04 10:55:58 +08:00
6f35c03e4a
driver: Makefile: support input in spl
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I492f19f6049d009b8f3671dbfbe79d2ee8cf984e
2020-04-04 10:55:58 +08:00
440eb126fa
spl: rkfw: add boot_sector to seperate uboot and boot load-address
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I04e2b00a8615fee24ee7722ab7bb9ad4931f4332
2020-04-04 10:55:58 +08:00
e8b9592f0e
common: spl: call the spl_next_stage() to get next stage process
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ibfe81766fcbfe002978b7d225a5602a8eeb89c12
2020-04-04 10:55:58 +08:00
2323b257d7
rockchip: spl: add get spl next stage driver
...
Use it to make sure which firmware can be bring up.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib2cec8bf7c78fa436efade0518b07c3193170c7b
2020-04-04 10:55:58 +08:00
69e1ad7bcf
spl: add spl next stage definition
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I822f0e92b158a673ce0d2e2265a5237f5870a58f
2020-04-04 10:55:58 +08:00
c88ba1c4c3
spl: add next_stage to struct spl_image_info
...
Add next_stage to indicate the next boot stage is uboot or kernel.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9104ede143c5a9c7f0bff6869e67d5e605e596ca
2020-04-04 10:55:58 +08:00
ae80c85fe8
power: io-domain: add initial message
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4b6a508371dba74a3c992786a6cdb4d5b4d6eb80
2020-04-04 09:57:19 +08:00
b4e157ffa2
make.sh: add version for spl loader
...
before:
rk3399_loader_v1.24.124.bin => rk3399_loader_spl.bin
after:
rk3399_loader_v1.24.124.bin => rk3399_spl_loader_v1.24.124.bin
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If5bcc02504760d178557d8db78889074fcad0427
2020-04-03 17:54:47 +08:00
6f3e9d5cd7
rockchip: fit: rename "required" to "verified-boot"
...
"verified-boot" is more clearly for developers.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib8a87af18480f2d5e765b9007eb5f8473ee424fb
2020-04-03 17:54:19 +08:00
767fd95d06
rockchip: fit: remove fit_get_image_defconf_node()
...
It is added in image-fit.c as a common function.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I105e0a7cacde226da1bb787ba1f4f320d6daa55d
2020-04-03 17:54:19 +08:00
d871c07160
common: image-fit: add some common APIs
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3df010d3b6a07efc7287779fe4a0a60ce9f1d2dc
2020-04-03 17:54:19 +08:00
2dc02ea380
common: bootm: support host sign check for armv7 fit image
...
including: fdt, u-boot, op-tee.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ieb3dc15383f47626ef125b5d64e96b90a0a67cc6
2020-04-03 17:54:19 +08:00
10530d82c2
rockchip: its: add "rollback-index" property
...
This property is verified to support rollback index protect
for verified-boot.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I54c5baaa275189ca96f18be66753b1292a395df6
2020-04-03 17:54:19 +08:00
479fbf72ee
drivers: mmc: use pre-configure set by pre-loader or bootrom
...
The MMC is initialized by pre-loader or bootrom, so it is no need to
initialize it again. Open this config to skip some unused initialized
process.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: If00fc3ce7df4d15e71ecfd8f8717a59640c3b7a9
2020-04-03 11:34:11 +08:00
68a90c3146
regulator: rk809/817: implement get the switch voltage
...
If the switch is enabled, it's voltage is same as parent supply.
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I8fb60bd5aa3bb0a47cac84982113663e2bf5941e
2020-04-02 12:20:04 +08:00
341631cbfb
crypto: rockchip: v2: pka: fix bug on set np
...
Change-Id: I2b3207dcb3ce138a8677796ae628d1f270fab621
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2020-04-01 17:31:06 +08:00
6b5b88bc03
dm: crypto: add zero hash support
...
Change-Id: Ib0f74e9636a214918511715cdd4ef32ebe65463a
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2020-04-01 17:31:06 +08:00
92a42bc5fe
common: image-fit: support hardware crypto hash
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2117282d9bece0fbf61802b36771fc0d1b909058
2020-04-01 17:30:41 +08:00
d07cb2b8b1
common: board_r: add ENV_MEM_LAYOUT_SETTINGS1 into mininum env
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I865256861668c424806a83d9327b662e480ad737
2020-04-01 17:30:41 +08:00
242e56fad2
lib: rsa: fix compile warning
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I75acadbb4fe6873c7306bd953234c1fb4ef5b0d9
2020-04-01 17:30:41 +08:00
Joseph Chen
Jason Zhu
Jianqun Xu
shengfei Xu
Lin Jinhan