Commit Graph

50371 Commits

Author SHA1 Message Date
Jon Lin 0a7542b5fd rkflash: support 25Q256JWEQ
Change-Id: I0c5feb11a3adbcbd5b82ae5adc8b322b48435847
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-13 19:11:00 +08:00
Jon Lin 534d4d2fe4 rkflash: support transfer large size data
Change-Id: I36c5daabb952215bbc4d2cb2cffb82df3fa7085a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-13 19:11:00 +08:00
Jon Lin 58463f4dec rkflash: change to use rk_sfc_op for request
Change-Id: I20cc6b3cf4b49a9ca96af5170af8b7b554071a6f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-13 19:11:00 +08:00
Jon Lin a6fcac41dc rkflash: add nand_mega_area description
Change-Id: Ibf4ab2b6d7d4d0e58f859ee47ec52c3cced79238
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-04-13 19:11:00 +08:00
Joseph Chen c3a9bbca4b scrptis: fit: fix cp same file
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4356da41e54211e6e9a2ae85603c2d26214ffe9e
2020-04-13 18:23:08 +08:00
Joseph Chen 0dcd90fbf2 scripts: fit: update rollback index assignment
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I95b66f244647b2b4b244bec9956e308ed93de0e5
2020-04-13 18:11:46 +08:00
Joseph Chen 9ea9857a3a make.sh: fix typo
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I71be6a3cd62839b42a23352c52cf9a78783df9eb
2020-04-13 18:11:46 +08:00
Joseph Chen 8bb63dbcf4 Merge branch 'next-dev' into thunder-boot 2020-04-13 11:55:01 +08:00
Joseph Chen 8032928d6f make.sh: remove unused files
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7be96a805c265b0790f2959e4de3c7313837eed6
2020-04-13 11:49:58 +08:00
Joseph Chen 906c745485 rockchip: rv1126: fit: add image property
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If985d7c8e1e76f7fe44ab79d3628df827c1fb63b
2020-04-13 11:30:44 +08:00
Joseph Chen 4dbccc141e rockchip: its: add image name property
Used by scripts/fit-unpack.sh

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idbe18ce7737d6df8d145393cd081adb2642106fb
2020-04-13 11:29:23 +08:00
Joseph Chen 61fbe583d5 scripts: fit: rename output image .fit to .img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id23b91c9ea04a91c8872bdb1cc02e307ff73b4f0
2020-04-13 11:29:23 +08:00
Joseph Chen 1ae3dd15e9 scripts: fit: support unpack any fit/itb file
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I14ac1594570cd9c7c8676b685bb605998b7263e8
2020-04-13 11:21:32 +08:00
Joseph Chen f995e0641e configs: rv1126: use DTC from U-Boot project
It seems low version DTC even not support "-Wno-unit_address_vs_reg"
input which causes a DTC compile fail, so let's use DTC from U-Boot
project.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4a54ab209b1c270eaaded6b98f569b959bacc5c6
2020-04-13 10:55:00 +08:00
Joseph Chen 7c3ca5002e make.sh: clean up
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I55ddc25e8ccbb7bd9661f2652ff114df8d32454f
2020-04-12 14:39:06 +08:00
Joseph Chen 37f507ff86 scritps: fit-base: add file existence check for its
remove loader pack from uboot itb build process.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I857d3560f49e4bbfcedf262ee195fbc4f9065d21
2020-04-12 14:39:06 +08:00
Joseph Chen 75e20461a6 tools: fit_image: add -Wno-unit_address_vs_reg
It seems this check is default enabled in high version DTC,
so let's force disable this noisy check since we don't care
about "reg" property for fit image.

<stdout>: Warning (unit_address_vs_reg): Node /images/uboot@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /images/uboot@1/hash@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /images/optee@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /images/optee@1/hash@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /images/fdt@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /images/fdt@1/hash@1 has a unit name, but no reg property
<stdout>: Warning (unit_address_vs_reg): Node /configurations/conf@1 has a unit name, but no reg property
......

Change-Id: I7d934bce66742c76397c004def1919bf4c6e7672
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-04-12 11:03:47 +08:00
Joseph Chen 030b8870e2 configs: rv1126: update configure to support fit and uimage
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I99a876341b12279838914d085dcc916b29ffe300
2020-04-10 16:41:02 +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 6cf81e2732 make.sh: add sub command "./make.sh fit-s"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3768fd73e6e60f0df1d10999ac65af774ca51771
2020-04-10 14:17:31 +08:00
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