Commit Graph

4946 Commits

Author SHA1 Message Date
Joseph Chen ca0130caa2 common: image-fit: correct fit_set_totalsize()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2febc67bf0b16611cd54afad75fa79ac7454f4a5
2020-06-01 14:44:48 +08:00
Joseph Chen 17a682eab6 common: fit: verify otp verified-boot flag along with kernel image
Don't verify otp verified-boot flag for every image, the same as
signature verify.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48c230db4429c9530066d0f42de1eea7609ba4b5
2020-05-28 19:13:38 +08:00
Joseph Chen 7c79bd2280 common: board_r: fix mtd blk compile error
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie24f8c9c7e0b2642d021ec5ce673e17b5c815514
2020-05-27 11:42:03 +08:00
Jason Zhu ddb43797d5 spl: mtd_blk: apply mtd_blk_map_partitions()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9ed6ff49d5e366797ae1b4d9128432d1ad0e7728
2020-05-26 22:13:28 +08:00
Jason Zhu 4e2ae7292a common: board_r: apply mtd_blk_map_partitions()
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I2e1fd21a6a41f8b86ab6f52c69631018a88445ec
2020-05-26 22:13:22 +08:00
Jason Zhu 69808149dc spl: rkfw: call misc_decompress_stop() to clear the decompress irq
Otherwise the next stage will respond to the decompress completed interrupt.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ie56a7eb939374bd5aac326bb3cd022225bf71dd2
2020-05-26 18:17:17 +08:00
Joseph Chen c516743f40 common: fit: add fit_set_totalsize() interface
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib10984da99aa82d5dd4bbfe2b13233e7155aee41
2020-05-25 14:57:18 +08:00
Joseph Chen 4a2b8db466 common: add usbplug support
- disable some message
- add "usbplug.bin" generation
- add minimum usbplug dtb support
- add individual board_init_r() init sequence.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If48ee49247fca6108db3a1fbab3b403241b3a8eb
2020-05-22 16:58:04 +08:00
Joseph Chen d45e5655df dm: serial: allow skip console serial init
Always use debug uart.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id751856abd7be219e8acb4c5986469a804051934
2020-05-22 16:46:40 +08:00
Joseph Chen aedbab3f0f common: cli: allow fall back to simple cli
The simple CLI mode only support run_command() which can't support
powerful command line syntax like if...then...else...fi conditionals
or `&&' and '||'.

The run_command_list() falls back to run_command().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I136cba71e02fd1f57c9a395b37679d9a885ba4a0
2020-05-22 16:46:40 +08:00
Joseph Chen 598c6b730e common: fdt_support: update code wrap by configure
It avoids compile error while disabling CONFIG_ARCH_FIXUP_FDT_MEMORY.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I283a335c2ecf559e42544ab138af414423d8a888
2020-05-22 16:46:40 +08:00
Joseph Chen d41e543aa6 common: spl: initial spl->next_stage
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5066612be4c90ff674b61034768eeaba9b9c9b85
2020-05-22 16:39:51 +08:00
Joseph Chen d4229e7722 image: fit: export fit_image_check_hash()
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I41c5c853e9fdad0a9e64c823a68cc88fb68a7e55
2020-05-13 18:37:52 +08:00
Joseph Chen b3622f5b4f common: board_r: skip initr_nand() if kernel dtb is enabled
Nand will be initialized at init_kernel_dtb().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I41ec1edfcb6328cbe02435143f212453e1638c80
2020-05-13 09:05:41 +08:00
Joseph Chen ab6f8011c4 Merge branch 'next-dev' into thunder-boot 2020-05-06 18:29:50 +08:00
Jason Zhu 1e33e3cb7c common: spl: ab: update new function to support ab system
Add spl_ab_append_part_slot()
Delete spl_get_partitions_sector()

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I116d6d708604762203974dc66a39be1a0e7b6bbe
2020-05-06 11:59:29 +08:00
Jason Zhu 9561619343 common: spl: mmc: delete ab system support in rkfw process
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I9cafffa266fbbe2c18c4300fdddb89944430cc0c
2020-05-06 11:59:22 +08:00
Joseph Chen 9c00c79ad8 Merge branch 'next-dev' into thunder-boot 2020-04-29 09:52:58 +08:00
Jason Zhu db9b4c53f2 common: spl: change TLB memory base align to SZ_16K
According to armv7 spec, translation table base 0 address is align to
2^(14-n). The n is set by TTBCR and is set to zero in uboot.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3d4c3f7165d3ef27bcc51d90471830f5e6dccae5
2020-04-29 09:07:43 +08:00
Joseph Chen e9e0746f31 Merge branch 'next-dev' into thunder-boot 2020-04-27 16:54:06 +08:00
Jason Zhu f141910278 common: android: fix compile error if only enable ab system
error: ‘reset_cpu_if_android_ab’ defined but not used
[-Werror=unused-function]

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I724ea99df27f9f572aa0913491eddb2b5e248e38
2020-04-27 14:32:51 +08:00
Jason Zhu 4736384cd0 spl: Kconfig: add SPL_AB depends on SPL_EFI_PARTITION
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Id4500ae748f965235aac278baee07f278d88d70a
2020-04-27 14:32:51 +08:00
Joseph Chen 2bc8e1106f Merge branch 'next-dev' into thunder-boot 2020-04-23 16:43:12 +08:00
Joseph Chen 1cef1b20c4 dm: misc: merge generic header file into misc.h
Puting the generic function declaration together that the
caller don't need care too much about different header file.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib37d1550e5a747d8f18e30c428ea8f613f9cc006
2020-04-23 16:17:06 +08:00
Joseph Chen 710cfa3daa Merge branch 'next-dev' into thunder-boot 2020-04-22 18:15:33 +08:00
Jason Zhu 5b7d32987c drivers: misc: use misc_mode to distinguish different device
The misc attach different device. We use the misc_mode to show
different device's capability.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ibce5bb0465e452a7e783c5859f1e8ab2bfd8b0c5
2020-04-22 18:08:19 +08:00
Joseph Chen 98894c7310 Merge branch 'next-dev' into thunder-boot 2020-04-21 16:19:07 +08:00
Joseph Chen 1f452cbf59 fit: support board sig verify require
Not allow non-signature image to boot if board requires
signature verify.

The board signature verify usually depends on otp/efuse
key is enabled or disabled.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4e4dd201e74712a53cb0f481463b48532e30bb40
2020-04-21 12:02:02 +08:00
Joseph Chen 11a8d4b2e0 Merge branch 'next-dev' into thunder-boot 2020-04-21 11:09:09 +08:00
Jason Zhu d300a21655 spl: mtd_blk: support load fit firmware
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3a32874977a7aa654b8e3fb432e3637b900525ab
2020-04-21 10:38:15 +08:00
Joseph Chen b0a6db3b4a Merge branch 'next-dev' into thunder-boot 2020-04-20 19:55:03 +08:00
Joseph Chen 30ef03eb67 spl: print entry point for U-Boot and OP-TEE
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifeb52986851b93cb634f177e3834cbf681f3dfb0
2020-04-20 19:42:03 +08:00
Joseph Chen ec4fe46226 fit: add comment for success return
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I58f1c1a159af2da675bd47b632022c2a0cdb9d40
2020-04-20 18:29:14 +08:00
Joseph Chen 5de879f9d8 common: board_f: reserve noncache memory region
board_r.c supports noncache memory region right below malloc
area, but board_f.c seems does not reserve it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7da218b6d994227a04a91cea02b64b6c91a0cc54
2020-04-20 18:29:14 +08:00
Joseph Chen c637f2321b Merge branch 'next-dev' into thunder-boot
Change-Id: I22ac688008080eac49169d752a94b66668f890fc

Conflicts:
	drivers/phy/Kconfig
	drivers/phy/Makefile
2020-04-16 15:48:00 +08:00
Joseph Chen a515b6d27e fit: spl: verify hashes of images by default
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iea4eabcd87ea612eeeb7cb5e34ce26adee053557
2020-04-16 14:18:10 +08:00
Joseph Chen da2f97ecea common: sig: require /signature node for images verify
Not allow fail if FIT_SIGANATURE is enabled.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icad787e4b25587121ede1b308c62e1a39e5899f1
2020-04-16 12:50:55 +08:00
Jason Zhu 2996edba74 common: spl: mmc: clean up the useless log
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ibf588d918ce6471aeb540321118e51877ce6fea0
2020-04-15 20:58:18 +08:00
Jason Zhu 6177e32d3d spl: rkfw: support decompress kernel and ramdisk
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I172b75ed0587726f5d465dcbb20bf9aa7e65e1e4
2020-04-15 11:55:40 +08:00
Jason Zhu fcf012f8b3 spl: Kconfig: add config SPL_KERNEL_COMPRESS_ADDR & SPL_RAMDISK_COMPRESS_ADDR
Load compressed kernel and ramdisk firmwares in these addresses.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Icca49069fcaa08c19f5ef574d9ec4f803dbba6d1
2020-04-15 11:55:40 +08:00
Joseph Chen a873a53297 Merge branch 'next-dev' into thunder-boot 2020-04-14 14:16:56 +08:00
Joseph Chen b074ddcefe common: sig: require /signature node if FIT_SIGANATURE is enabled
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I415d198f4d97f6430f7a0bfd478e3bdfb2c6b5aa
2020-04-14 13:10:19 +08:00
Rick Chen f8ddf2aa61 UPSTREAM: tools: mkimage: Support RISC-V arch
Add riscv uimage arch to support riscv-linux booting.
It can Convert riscv-linux to image which can be
booted by bootm command.

Signed-off-by: Rick Chen <rick@andestech.com>
Signed-off-by: Rick Chen <rickchen36@gmail.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I38119fadebb4fa9f1db12897d6561f97fbf03f02
(cherry picked from commit: 86aa65a0cd2)
2020-04-14 12:45:33 +08:00
Rick Chen ade0ea07bd UPSTREAM: riscv: Modify generic codes to support RISC-V
Support common commands bdinfo and image format,
also modify common generic flow for RISC-V.

Signed-off-by: Rick Chen <rick@andestech.com>
Signed-off-by: Rick Chen <rickchen36@gmail.com>
Signed-off-by: Greentime Hu <green.hu@gmail.com>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Change-Id: Id58d17cd58433fdadc8ce7ee78d72035f84adb53
(cherry picked from commit 068feb9b86d991283c43b56e36094f4e6f484d04)
2020-04-14 12:45:33 +08:00
Jason Zhu 342d050ebb spl: fit: support boot standalone firmware
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: Ib3e35cfba0bb52141c8948de994f5e6c9661887f
2020-04-14 12:45:33 +08:00
Marek Vasut f2413b2f2f UPSTREAM: fit: Add standalone image type handling
Just add IH_TYPE_STANDALONE to fit_get_image_type_property().

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I0e3dbfad3e15decb81665fabb8d25e1b71f4c7b7
(cherry picked from commit 0298d203754)
2020-04-14 12:45:33 +08:00
Joseph Chen 9d4243d397 Merge branch 'next-dev' into thunder-boot 2020-04-10 16:38:43 +08:00
Joseph Chen e7be2a072c Kconfig: disable CLI for verified-boot
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I09acae3dda1a886629d0f9901b4c95059cdd8b42
2020-04-10 14:17:32 +08:00
Joseph Chen f8f8bbc62f Merge branch 'next-dev' into thunder-boot 2020-04-10 12:05:09 +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