4103a11cae
Merge branch 'next-dev' into thunder-boot
2020-03-30 18:02:29 +08:00
505eebf24e
rockchip: make_fit_optee.sh: update UBOOT_OFFSET from configure file
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6d793f186ae8bfd01c50fbc2c4f44c32bb54ddc0
2020-03-30 17:32:14 +08:00
56ed6b5161
scripts: setlocalversion: add more information
...
- add build username;
- add latest commit creation time.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If038927af085bd02707c0baa23e8ae321d3cae37
2020-03-30 17:31:40 +08:00
68c4faa3f8
rockchip: mkimage: support packing optional second level boot-loader
...
Support packing optional second level boot-loader:
$ ./tools/mkimage -n rk3399 -T rksd -d \
rk3399_ddr_800MHz_v1.24.bin:rk3399_miniloader_v1.19.bin out -v
Adding Image rk3399_ddr_800MHz_v1.24.bin
Size 116492(pad to 116736)
Adding Image rk3399_miniloader_v1.19.bin
Size 88060(pad to 88064)
Image Type: Rockchip RK33 (SD/MMC) boot image
Init Data Size: 116736 bytes
Boot Data Size: 88064 bytes
Mainly parse init file and boot file from datafile option, copy them to
the image, and padding each one to 2KB boundary.
NOTE:
I don't know much about rknand.c, and there's no way to verify it now.
The output image is unchanged though (with a few extra padding).
Haven't got any feedback from upstream yet...But whatever, let's do this!
Change-Id: I0ce98a44634cfcd8acfe9a3e2cfbe3ee0107fba4
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
2020-03-30 14:52:08 +08:00
3edf1a0ecf
rockchip: rv1126: set the region 0 unsecure
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9fd0a35571b339cf1f171b9a188a36f9309fdb0e
2020-03-30 14:49:49 +08:00
7ddd80d345
configs: rv1126: support spi nor and mtd block driver build
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Iacdde98f650fa7c047d0612b07e47fa2b7f82ba8
2020-03-30 14:49:37 +08:00
f7a0a6a39a
rockchip: dts: rv1126: add nandc node
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I175c63952dc0baa2d26aadfc17f56eb0a1323440
2020-03-30 14:14:20 +08:00
10b211a2ec
rockchip: dts: rv1126: add sfc node
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I1d09fadcb9df446326a7ba00903cf2856eff76fb
2020-03-30 14:14:05 +08:00
84c6e8b755
configs: rv1126: enlarge CONFIG_SYS_MALLOC_F_LEN
...
Enlarge heap to storge MMU page table when enable dcache.
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I4604794b1ff2cf6d7075b690eedea24677a53a3e
2020-03-30 14:13:29 +08:00
1c8a43845b
configs: rv1126: support load rkfw in spl
...
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ia22170cbdbd28980a6d14b46cc8da50fe2ee0ce8
2020-03-30 14:12:17 +08:00
f8cddc3e74
clk: rockchip: rv1126: Add support for SCR1
...
Change-Id: I22f0cea9ab0612250ab41526684dc3d786555a37
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-30 09:43:42 +08:00
96f5441ec8
common: fit: support spl fit image check by tools/fit_check_sign
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0e03a90d50290e18c6fb2cd44516c352f3695290
2020-03-29 09:57:04 +08:00
8e3eb57c1c
rockchip: add arm 32/64 its file for verified-boot image
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If4d76b8736510ca6455a4b448e9d2ed1be5721fe
2020-03-29 09:57:04 +08:00
bfbe87590f
cmd: bootuimage: return -1 as error code
...
support autoboot to traverse all bootcmd list.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I03f10a5982c4a9bb0eee429f756dd19c027c3371
2020-03-28 18:25:32 +08:00
e2c45c31e9
cmd: bootfit: return -1 as error code
...
support autoboot to traverse all bootcmd list.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibb35c20fb9ffcf58130aaeaea072c2dd6bc46256
2020-03-28 18:25:32 +08:00
9889a0e0a7
rockchip: hotkey: update configure name
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie04b4aa61900f11937f93b6a363ad827a8b7dd86
2020-03-28 18:21:16 +08:00
37526a5172
common: support disable CLI for verified-boot
...
Not allow any interactive from CLI.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I207da3f2c54df1a81100c404f045023ac763da73
2020-03-28 18:21:16 +08:00
4ab50248f6
rockchip: implement autoboot_command_fail_handle()
...
It's not friendly to handle the fail event in a bootcmd list,
let's handle this in C function.
Entering rockusb/fastboot mode after verified-boot failed.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib617582e1cc386f5c30abe1a8bbd2b5f353c0e49
2020-03-28 18:21:16 +08:00
7fc773a76d
common: add autoboot_command_fail_handle() callback
...
Maybe user need to do some job when bootcmd failed, they
could override it.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1c32c1ad37700e66d45fe033fbfa46d3f350205d
2020-03-28 18:21:16 +08:00
96158db731
arm: rockchip: select CONFIG_PANIC_HANG
...
Not reset system.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I03b02fa0aada05dcea34a3e4609c68cc1b9cb029
2020-03-28 18:16:08 +08:00
5f14e3de56
include: rsa: fix compile error
...
Fix for: CONFIG_SPL_FIT_SIGNATURE && !CONFIG_FIT_SIGNATURE
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8242d208db14aa9066bb8c6d430686f909258844
2020-03-28 18:16:08 +08:00
6ea30212cc
clk: rockchip: rv1126: Rename I2S clocks
...
Change-Id: Idc6659013dde74f09e86a7120fc42348b87d63f8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-28 16:41:12 +08:00
032bdc838e
rockchip: rv1126: add rockchip_get_clk/cru interface
...
Change-Id: I88684c98a9126c750e6966f1fccab13f736cf957
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-28 16:41:12 +08:00
e1e9b173e4
Merge branch 'next-dev' into thunder-boot
2020-03-28 15:01:31 +08:00
4e07096a0b
rockchip: fit: reserve LSB as an image identity number
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I917e89793aebc6a411ad7e4678b00e7f7b770e73
2020-03-27 18:08:12 +08:00
ba2acfb819
rockchip: make_fit_atf.py: update conf@1 descrption and arch
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5eeb1b897508db1073b2ec63b9e28a895c1f417b
2020-03-27 18:08:11 +08:00
311b4dd629
rockchip: make_fit_optee.sh: add components for verified boot
...
Require sha256 and rsa2048 for all images to be signed.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5c74f811fe5c49a2552a5a059c200a0d35f210cb
2020-03-27 18:08:11 +08:00
957222d7c6
common: image: support IMAGE_PARAM_INVAL as placeholder address flag
...
User maybe not want to set a fixed address, leave it to U-Boot.
This is a compatible method for different board and platforms.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I01accbc0f116856276610bfaea8de2f7e1275bb0
2020-03-27 18:07:52 +08:00
40d08d0f10
tools: mkimage: support pack empty file for multi image
...
Muilt image bootflow requires ramdisk as a mandory component,
so that we have to pack a empty ramdisk into multi image at
some time.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I551ae832fbc68514ead0a3337148593e3113394f
2020-03-27 18:02:55 +08:00
a86a723e2e
rockchip: uimage: fix alloc and free ramdisk sysmem
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I84d965caff7c0d733792bcf2387d751808991c0d
2020-03-27 16:12:20 +08:00
96a4cf48b5
power: io-domain: fix err handle for regulator get
...
Change-Id: I7c8d760676c15776df35708bf4d35552da0cf96b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-03-27 15:17:53 +08:00
1e25cba32a
rockchip: rv1126: add chip info
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I907dd5c6fb72851ecebe4c6dc43ad01c5ecff66e
2020-03-27 15:16:40 +08:00
7422c37211
rockchip: rv1126: add dwc3 board init
...
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I4c5eeeedc240197ec0fda2b236890b53b916dfb6
2020-03-27 11:12:34 +08:00
239902f59e
rockchip: rv1126: add rv1126 usb building support
...
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I787d256cdcc387b7c95aaadacc97ad5f2cd4ef33
2020-03-27 11:12:34 +08:00
3062ae7eca
rockchip: dts: rv1126: add usb gadget for U-Boot
...
This patch delete the phys property because the driver of usb2phy
is not complete.
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Idc75693679e672e1c8ede2f3775d7fd58e9704d9
2020-03-27 11:11:18 +08:00
d532d22e94
input: rk8xx: enable interrupt only in suspend
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d5a2e38b8a73d11aa86cd9a0f18ca32b218d892
2020-03-26 16:07:42 +08:00
85fbd17d0d
configs: rv1126: update configure
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48c0bc4b90d6927ef5da1db48b300e7d82c3bc83
2020-03-26 16:04:46 +08:00
f8ca32e1ca
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
2020-03-26 15:12:38 +08:00
594e14a437
common: spl: support enable D-cache for 32-bit platform
...
- Initial gd->bd->bi_dram[] for arm32.
- Add a configure to enable/disable SPL D-cache.
- Please make sure CONFIG_SPL_SYS_MALLOC_F_LEN is large
enough for TLB and bd_t buffer while enabling dcache
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I85f2169fe44b44e16edb15a9538df516037e9823
2020-03-26 14:56:18 +08:00
c155446281
rockchip: common: set CONFIG_NR_DRAM_BANKS for SPL
...
SPL don't need so many dram banks.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie4a48361bb4911466e58ba859ffb51dcb616fbbb
2020-03-26 14:52:31 +08:00
95bd63d1b1
clk: rockchip: rv1126: Change HCLK_PDCORE_HZ to 200MHz
...
Change-Id: Ic5631f6ef4b7308b879b5701ba142c3e853b0672
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-26 09:13:26 +08:00
b865093666
clk: rockchip: rv1126: Change some clocks' parent to GPLL
...
Change-Id: Ibba02fee3df6c98308d5fd657a30af3eba7321d5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-26 09:13:26 +08:00
6224aca828
clk: rockchip: rv1126: Fix HCLK_PDPHP_DIV_SHIFT
...
Change-Id: Ia30bcf94de7ee3e40359fdd47d4e8c6600f4559d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-26 09:13:26 +08:00
0fdee37b0a
drivers: irq: add irq to gpio v2 transfer support
...
Some platform with new GPIO IP implements the low/high
registers with write mask. This configure handles it.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I855357d29e7fba072b867c06a31a049462ebf6ff
2020-03-25 21:12:49 +08:00
3ec172ba59
pmic: rk8xx: update reg count for RK817/809
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I55e25a3f6ce46c6bfbdd440910824e527fdc4c58
2020-03-25 21:12:48 +08:00
c1221a7da4
rockchip: dts: rv1126: add recovery key for U-Boot
...
Remove unused ramdisk-ro node.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibc61aacc9ce98d243b7044cdcfddf103bb0c7b82
2020-03-25 17:37:49 +08:00
b60ec54ef2
rockchip: rv1126: enable GICv2 and ARM SMCCC
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I07c7c1db952a3865a17052d0f10cb84733214737
2020-03-25 17:23:08 +08:00
51626bc227
rockchip: dts: rv1126: sync from kernel
...
sync from:
(73d195a ARM: configs: rv1109_defconfig: enable CONFIG_DEVTMPFS_MOUNT)
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5fa9043871865a5d7f457d20718c4b7e8a7ebf51
2020-03-25 17:23:08 +08:00
7b515e87ee
rockchip: rv1126: syscon add pmugrf and scan fdt
...
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I288566a68876c02aae8470a0b9aca2974ef16fe6
2020-03-25 16:50:47 +08:00
5b204fcb90
rockchip: dts: rv1126: delete /omit-if-no-ref/
...
DTC from U-Boot don't support this property.
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If2bf503615b7b28390d414b89cfb83938b33a4a6
2020-03-25 16:23:52 +08:00
Joseph Chen
Jeffy Chen
Jason Zhu
Finley Xiao
Jianqun Xu
Ren Jianing