qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
50,450 Commits 1 Branch 0 Tags 137 MiB
Commit Graph

50450 Commits

Author SHA1 Message Date
Joseph Chen f8f8bbc62f Merge branch 'next-dev' into thunder-boot 2020-04-10 12:05:09 +08:00
Joseph Chen 69b6e59094 make.sh: optimise fit 
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I527656dbcd550c5520edb8e5a677854d9623cf55
 2020-04-10 11:06:46 +08:00
Joseph Chen 75323eb827 scripts: add a set of fit scripts for vboot 
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie408ef9ff94e880f96e2201f706ee5d0ac44d54c
 2020-04-10 11:06:46 +08:00
Joseph Chen 22c7c1a827 spl: fit: support load multiple backup of images 
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I29bce60f1b958baedbd2b45e86a611b89547c0d8
 2020-04-10 10:22:22 +08:00
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Jason Zhu d8d6a3122d configs: add rv1126_spi_nor_defconfig 
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ic4694e1946757463054a974f72425334732275a0
 2020-04-08 20:49:26 +08:00
Jason Zhu 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
Jason Zhu a001312388 rockchip: rv1126: change the rockusb PID 
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I73a2876d860abafeb4440c3a675a191238ab795d
 2020-04-08 17:09:13 +08:00
Joseph Chen 958c61be27 rockchip: rv1126: add make fit script 
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I502661c810a98bc7abd3d504fe8a9847ad1a9616
 2020-04-08 15:36:33 +08:00
Joseph Chen 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
Jason Zhu 3422369e61 misc: Kconfig: change the SPL_ROCKCHIP_HW_DECOMPRESS dependent's attribute 
Change "depends on MISC" to "depends on SPL_MISC".

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I1b6c2296d5e88e4e2c0cbafb9bb31790d6f25e66
 2020-04-08 14:22:27 +08:00
Joseph Chen 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
Jason Zhu dd99ea93f4 configs: rv1126: use the rv1126_emmc_defconfig to generate smaller firmware 
This defconfig just support emmc storage, and generate smaller firmware
than rv1126_defconfig.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I694261161839518224550e4e58c2f3ffb358d11b
 2020-04-08 11:50:28 +08:00
Joseph Chen 2e56676112 make.sh: add rv1126 configure 
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9dbd8284c68370901a4c61a0a8a6b6ae519db186
 2020-04-07 21:23:39 +08:00
Joseph Chen 41bb8b737c Merge branch 'next-dev' into thunder-boot 
Conflicts:
	common/spl/spl_rkfw.c
	drivers/pinctrl/pinctrl-rockchip.c
	make.sh

Change-Id: I93f4dbe1e067c3b938bf64c4964bd5e7023b1daf
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
 2020-04-07 21:18:08 +08:00
Joseph Chen aa415ed977 common: spl: fix cherry-pick sync conflict 
fixes: (1cb393f common: spl: rkfw: support bing-up arm32 firmware)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1b7f1a6269794ea9a4a508933381bbb8e3e7133b
 2020-04-07 21:00:48 +08:00
Joseph Chen 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen cbfcd6136d Revert "configs: rv1126: support bring up uncompressed kernel" 
This reverts commit f0e7263846.

It's waste a lot of boot time.

Change-Id: Ib4fa67d5792de7e64d3830b928f956a82f13379a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
 2020-04-07 19:34:18 +08:00
Joseph Chen 80a43a36b0 rockchip: rv1126: select SUPPORT_TPL 
Workaround: skip ram initial in arch/arm/mach-rockchip/spl.c

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I567f52bd0ddbfdd9d79278a39fc2076be57b3d66
 2020-04-07 19:12:49 +08:00
Joseph Chen 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
Joseph Chen 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
Jason Zhu 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
Jason Zhu 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)

Change-Id: I3b1420989d158c52259365d90011524b047b5750
 2020-04-07 17:47:16 +08:00
Jianqun Xu 42375b1080 pinctrl: rockchip: fix RK_GENMASK_VAL error 
Change-Id: I5c6cb3ace53a86e9d8bfed0966950af3a47cd732
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
 2020-04-07 16:03:45 +08:00
Jianqun Xu 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
Joseph Chen 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
Joseph Chen 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
Joseph Chen 78e35b2b4f rockchip: rv1126: update bootcmd according to fit signature 
only allow fit image if CONFIG_FIT_SIGNATURE is enabled.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I96b713a2a3eb0b148bda4215a99288b379d66efe
 2020-04-04 19:43:13 +08:00
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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
Jason Zhu 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