Commit Graph

50943 Commits

Author SHA1 Message Date
Joseph Chen 3db2d9fdeb rockchip: weak: support soft gunzip image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I645627b9e6c1e027be9532f25f3da7bc1e7b6928
2020-10-22 16:37:49 +08:00
Joseph Chen c3723ef337 clk: rockchip: rk3399: support crypto clk set/get in SPL
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I159d062320ca523e8dc4f0dcce94a619692481f3
2020-10-22 16:37:49 +08:00
Joseph Chen 9b6b8f53f4 make.sh: show elf source of nm command
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I632ee35b42326516a0611878899335d338011e32
2020-10-22 16:37:49 +08:00
Joseph Chen cb718016c1 make.sh: support pack fit uboot.img for armv8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ieacddba103b0d072de84af9764e5f69e87126e83
2020-10-22 16:37:49 +08:00
Joseph Chen 392231a732 rockchip: add make_fit_atf.sh for armv8 to generate u-boot.itb
Add support:
	- decode bl31.elf to binary;
	- include tee.bin dynamically;
	- none or gzip compression;

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I483cb81b6ab05a89fd0df3a2a7d95e6ff3ad6636
2020-10-22 16:37:49 +08:00
Joseph Chen 9e84e21cf4 configs: rv1126: use make_fit_optee.sh as fit generator
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I31237cbcefcd62a0abbe7a549f46ad41f646ac55
2020-10-22 16:37:49 +08:00
Joseph Chen 65a17145ae rockchip: make_fit_optee.sh: sync from rv1126_make_fit.sh
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iaa3dc834b9e49e025d9feed1c03965ef2f1a4f35
2020-10-22 16:37:49 +08:00
Joseph Chen c45a6d11b5 rockchip: rv1126: fit: clean coding style
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ibfba9e70d3d5bcae8bd6850ab546edc736f56ba4
2020-10-22 16:37:49 +08:00
Joseph Chen a9c93f9d80 rockchip: make_fit_args: support make u-boot.itb command
The command pass board dtb as arg1.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie96ad09665698904978caca82ec38843930ed09e
2020-10-22 16:37:49 +08:00
Joseph Chen 45dfd9925e rockchip: make_fit_atf.py: remove '@1' of nodes
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9a398826213dd66df58aeac985146997e085f7d1
2020-10-22 16:37:49 +08:00
Jon Lin 6524556d8d mtd: mtd_blk: Fix the way to get Nand mtd_info
Change-Id: I6e47180db41242a92ac74083d5984bcb06d92e9c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-19 11:00:29 +08:00
Yifeng Zhao 6f8d5ecc09 spl: nand: add mtd erase size config for mtd blk
The mtd blk need mtd erase size to check bad block.x

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: If1bca0ce442599be41f3fd12638529018885f3e0
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-16 17:57:43 +08:00
Jon Lin 3ac03e839f mtd: spinand: Support FM25S02A
Change-Id: I855a01500977285c4b8eb09ec1c013a4cdb5636e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-15 16:02:18 +08:00
Jon Lin ea89190d3a rockchip: vendor: Deinit bootdev_type if initial process fail
Change-Id: I1da43b5e576bfc3410c30794986975f2cb0ee092
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-13 19:30:07 +08:00
Joseph Chen a04950ce79 rockchip: rv1126: init QoS for ramboot
There is not SPL for ramboot, let's init QoS for it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib6221122c44702cb4f287bad721316751478be71
2020-10-12 15:38:21 +08:00
Sugar Zhang 9a4028eb5b rockchip: rv1126: Set BOOT_WATCHDOG flag if reset by WDT
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia3d437c33ae9a7d3f666df70c484e1e6b28a90e5
2020-10-12 11:48:11 +08:00
Joseph Chen b444b7fa1e rockchip: rv1126: fix typo
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If26223219d3f0e3d6ca37b6bc0c740411a87fe01
2020-10-10 16:17:06 +08:00
Joseph Chen e7498cb05b common: android: show ramdisk size of boot and vendor-boot
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia8eca7010989e64d10b09628a12bcfc5aaeb988c
2020-10-10 16:17:06 +08:00
Jon Lin 9f568152b6 rkflash: Fix last data block vpn has been modify issue
Change-Id: Ie3aa7140c368693ddd18a53225975ec2fd6ce141
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-10 14:54:28 +08:00
Ziyuan Xu a964d8e5bb clk: rockchip: rv1126: mux partial clocks to GPLL for tb
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I33d2396d0de5bb5fc81990a1ae10e4c80f45e5cd
2020-09-30 17:36:47 +08:00
Ziyuan Xu eeb4ca8743 rockchip: rv1126: mux clocks to none-cpll
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ida1561569814d6a139818820940012ce7b9f856b
2020-09-30 17:36:40 +08:00
Nickey Yang 796dfc0875 rockchip: rv1126: Adjust the parameters of GPLL's VCO for THUNDER_BOOT
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: Ib322b62c1adbe355c2d64488fb33266bca974ea5
2020-09-30 14:51:19 +08:00
Kever Yang ce2eb8d1fb disk: efi: handle factory image gpt
The factory image doesn't know the correct emmc capacity, so it use
0xffffffff as the size, in this case:
- The primary gpt header's last_usable_lba is (0xffffffff - 34)
- The backup gpt table is missing
We need to fix these two issues.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I8a1fa65b0af1723017c87d52b4ef594353ce46ff
2020-09-29 09:31:54 +08:00
Kever Yang 95522b57e0 disk: efi: do not fix the gpt error at SPL in normal boot
We handle the error at U-Boot stage instead of SPL stage in normal case,
still need to do this in SPL when there is no U-Boot proper.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I008caaa0d1f95316fc0b87cb55de35d8f8e31b36
2020-09-29 09:31:16 +08:00
Elaine Zhang 1252bc90e4 rockchip: rv1126: config PMU_NOC_AUTO_CON
When perform idle operation, corresponding clock can
be opened or gated automatically.

Change-Id: Ib33115024b3f85f1f8bcabf2548caf3b13b0361f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-09-28 14:44:07 +08:00
Kever Yang 4857df5d78 rockchip: evb-rk3128: enable android boot cmd
Enable android boot cmd to support rk aosp boot img.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Change-Id: I37fc3311ccbc4251e6ef90599f534b485a38f0dd
2020-09-27 11:16:50 +08:00
Joseph Chen 02b8a383be rockchip: rk3308: remove unused code
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id079ca34c140de00c1a798327420c8687c660631
2020-09-24 17:13:18 +08:00
Joseph Chen 7abb254d74 rockchip: board: correct debug uart init
Should use debug_uart_init() which include board_debug_uart_init().

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib3479aed3e874ac11da3ebb8f8868a6f43218ef8
2020-09-24 17:13:18 +08:00
Dayao Ji 40a6a2cba2 fastboot: add virtual A/B feature support
Add "fasboot getvar snapshot-update-status" support and
prevent erase/wipe of userdata/metadata when virtual A/B
merge status is MERGING or SNAPSHOTTED (+source slot !=
current slot).

Signed-off-by: Dayao Ji <jdy@rock-chips.com>
Change-Id: Ibb6ea5778b78b2601178f489d6efcee60d5d0a49
2020-09-23 19:01:12 +08:00
Dayao Ji 132e9ecacf rockchip: rkimg: Add R/W interfaces for virtual A/B metadata
According to the AOSP default definition, the virtual A/B
metadata is located at the offset 32KB of the misc partition.

Signed-off-by: Dayao Ji <jdy@rock-chips.com>
Change-Id: Ib60379f25e4c72be9f5ed03934ab7dc928cdd585
2020-09-23 16:26:32 +08:00
Joseph Chen ab2b3191ab rockchip: rv1126: add periph device region for thunder-boot SPL
It makes thunder-boot SPL only map periph device region as
dcache off but not all 4GB region to save boot time.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib0abafe1b74cde24755780261fb7fcfaa8932ea2
2020-09-21 15:42:09 +08:00
Joseph Chen 2a3fb7bb04 arm: cp15: only map periph device region as dcache off for thunder-boot SPL
Don't waste time to map all 4GB region.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I24ba4e4e42545dcf3ac6622c36995485956eae1b
2020-09-21 15:41:43 +08:00
Joseph Chen d93c779cf8 include: linux: add SZ_3G/4G definition
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I97ebf0e488bc33da29c923e7fe9a253f5369ad9a
2020-09-21 15:38:29 +08:00
Joseph Chen 745aeb1a7d common: android: add boot_img_hdr_v3 and vendor boot support
Android Header v3 and vendor boot partition are introduced
from Android-11(R).

Header populate:
  Header v3 is no longer compatible with v0/1/2 header, we
  add populate_andr_img_hdr() to merge boot and vendor_boot
  partition header into struct andr_img_hdr in order to
  compatible with v0/1/2 header.

resource.img:
  The second_addr and second_size fields are removed in v3,
  so we require resource partition to restore resource.img.

A/B system:
  If not A/B system, the boot.img header version is 3 and
  recovery header is version 2.

AVB load image:
  - If allow verification error: the image is loaded by
    ops->get_preloaded_partition() which auto populates
    boot_img_hdr_v3.
  - If not allow verification error: the image is full loaded
    by ops->read_from_partition() which doesn't populate
    boot_img_hdr_v3, we need to fix it.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2afce53c43d782fc57baa01acf9c05518b580840
2020-09-18 14:41:37 +08:00
Liang Chen 5a4b526e82 configs: rk3399: enable D-cache for SPL
enlarge the CONFIG_SYS_MALLOC_F_LEN for MMU table

Change-Id: I77800cb6dd8a2049d43edee4ebdfcf16c3333f94
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-09-17 20:03:01 +08:00
Joseph Chen 93fd134f77 common: malloc simple: enable space exhausted message
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If089f38abf5e205a2b9f00fd2d735751fd7d5201
2020-09-17 20:03:01 +08:00
Jon Lin e091dc9d13 mtd: mtd_blk: Map table length round up to erase size
Change-Id: I5f615d37a572ce0d8ceb8d6d6b76983fc61e316b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-17 15:20:49 +08:00
Jason Zhu 51ceae363d mtd: mtd_blk: support map bad block table in spl
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I48112628812b948e4ab5a34362c8ada12b00471e
2020-09-17 15:20:49 +08:00
Jon Lin 2ac88c1bbc rkflash: Check bad block mark in spare 1st and 2nd byte
Change-Id: I60bb761d1f7a015c76939db165c53bf53bd514cf
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-17 14:40:02 +08:00
Jon Lin 03d86fc3c0 mtd: spinand: Support FM25S01A
Change-Id: I805cbf0e8bc47cd9bd94fd296dbaf46921490f15
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-16 12:58:33 +08:00
Joseph Chen ae33e3114a scripts: rename fit-mkimg.sh to fit.sh
The name style follows other rockchip scripts is better, like:

./scripts/atf.sh
./scripts/loader.sh
./scripts/spl.sh
./scripts/tos.sh
./scripts/uboot.sh

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I249f67d0b4e385a3f05f9c754bc0a9c371b46910
2020-09-16 12:07:26 +08:00
Joseph Chen 3a02727caf scripts: uboot.sh: use lodaerimage from rkbin
Upstream U-Boot can't generate local loaderimage.

Change-Id: Ic5748003cdbd4df2cd8c558acf4f6a02d7307ab0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-09-16 12:07:25 +08:00
Joseph Chen 45986beb25 scripts: not allow error for rockchip scripts
Change-Id: Iee56011cda94803802d368f7a8f27590d1091d16
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-09-16 12:07:25 +08:00
Joseph Chen a524b379f7 make.sh: support parse CONFIG_SYS_TEXT_BASE for upstream U-Boot
Change-Id: Ic3be7c38d4eb11924ea2a09e6256210dc61009c9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-09-16 12:07:25 +08:00
Nickey Yang e50bd74269 rockchip: dts: rv1126: correct build errror
this patch fixed "rockchip: dts: rv1126: SFC add pinctrl"
build error log:
   Error: arch/arm/dts/rv1126-pinctrl.dtsi:291.3-4 syntax error
   FATAL ERROR: Unable to parse input tree

Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
Change-Id: I4dde5b49fc2b56701b3326bca4978529286455c3
2020-09-16 11:01:58 +08:00
Jason Zhu 0ee21b67f5 include: image: fix compile error
error message: include/image.h:1015:1: error: unknown type
name 'bool'; did you mean '_Bool'?

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I786c04be6f389ad42685b934eb13426ea9a9e5a4
2020-09-16 08:39:09 +08:00
Jon Lin f28847a81d rkflash: Simplify SPI Nand flash table
1.Simplify SPI Nand flash table
2.Support new SPI Nand devices
3.Format coding styles

Change-Id: Ie7beae2de5b2165ce7f727aa6eab18d726d0dedc
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-16 08:39:00 +08:00
Jon Lin 4d72219b9d rkflash: Remove SFC reset in initial progress
Only when the host work wrong, run SFC reset.

Change-Id: Ia2c7f30e4e93203250dc378f2704942d99d73c55
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-16 08:38:37 +08:00
Jon Lin bc966f92a1 rockchip: dts: rv1126: SFC add pinctrl
1.SFC add pinctrl;
2.Adjust fspi_pins property.

Change-Id: Ia89669aeee9a5097c7a74850b478891573493f1d
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-16 08:38:10 +08:00
Jon Lin b66d41c240 mtd: spinand: Support hyf devices
Support HYF1GQ4UPACAE, HYF1GQ4UDACAE

Change-Id: I9b8022d9320150d587b443cfa4cdc7495267795e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-16 08:37:57 +08:00