Commit Graph

154 Commits

Author SHA1 Message Date
Joseph Chen 3a711d9c62 make.sh: add host tool check for fit image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I16bb64c3d0cb9be5d3c2dc55b61400dfb0bb23be
2021-01-29 09:44:50 +08:00
Joseph Chen 173e789e96 make/fit.sh: support replace components of uboot.img
args: --uboot [bin] --fdt [bin] --tee [bin] --mcu [bin] --bl31 [elf]

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4453cd48d352592fb232b67c5f70d04845d00545
2020-12-30 17:45:34 +08:00
Joseph Chen 173a9307d4 make/fit.sh: show itb making process info
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6dc634060044839ebbf545cdb20fa38ee05df04b
2020-12-17 17:35:45 +08:00
Joseph Chen 33e46123fc make/fit.sh: arm64 support pack mcu.bin
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic9324204075ebce4fd746593887894283bde0de1
2020-12-17 15:18:20 +08:00
Joseph Chen cab35d601e make.sh: use "atf-1" to check uboot.img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I49004f1dac8eaedd11c449ab7f6e6fba7c0605c4
2020-11-14 15:25:33 +08:00
Joseph Chen 6b7fba5894 make.sh: check pyelftools for 64-bit uboot.img
arch/arm/mach-rockchip/decode_bl31.py depends on pyelftools.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic7a0524df5b58472b5cb73e8b0c83a997426eb1b
2020-11-09 19:49:18 +08:00
Joseph Chen df4d86e5a0 make.sh: build with python2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0d08c0275691590a5308c7917f1e2d273f15fab6
2020-11-02 21:26:47 +08:00
Joseph Chen 2d11b8685e make/fit.sh: simplify and support sign uboot.img only
Remove some unnecessary args.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I03c8a59f76bb79af07af399ad4cf479d7258cec5
2020-10-28 21:23:07 +08:00
Joseph Chen 46e7ba36f6 make.sh: compatible make_fit_atf.py and make_fit_atf.sh
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia0ec8373d1a6aaf4a68bea7eafbc0f63a050f9b4
2020-10-23 17:39:27 +08:00
Joseph Chen 407bd0fb9b make.sh: rm bl31.elf and tee.bin before packing itb
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iafc924a8d559f0ed12a8fbf2a127ff23898803ec
2020-10-23 15:57:31 +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 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 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 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
Joseph Chen a505e63b04 make.sh: support pack idblock.bin
Syntax:
	./make.sh --idblock [--tpl] [--spl] [ini file]

Example:
	./make.sh --idblock
	./make.sh --idblock --spl
	./make.sh --idblock --tpl
	./make.sh --idblock --tpl --spl
	./make.sh --idblock --tpl --spl ../rkbin/RKBOOT/RK3128MINIALL.ini

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I173ec258e89c4599eff751eff1b7b6fc12737e4a
2020-08-11 20:28:08 +08:00
Joseph Chen b42d2103f1 make.sh: clean up and simplify
There are so many commands in make.sh, we have to clean
and seperate command into individual script file. And
some command is to be the official option for outside.

By the way, adding nm command to analyze image size.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I37ba38b621216f6db79325fada5980a54ca987cb
2020-08-11 20:28:08 +08:00
Joseph Chen 07d90e7755 make.sh: add args to assign uboot and trust image size
syntax:
	--sz-uboot <cell KB> <number of cells>
	--sz-trust <cell KB> <number of cells>

example:
	./make.sh rk3399 --sz-uboot 1024 2
			|
			V
	uboot.img = 1024KB * 2 = 2048KB

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I809ddd762545069b45ab8b0977630ffdd7d8b50c
2020-07-14 10:31:11 +08:00
Joseph Chen 1df865f3f3 make.sh: config fragment support nested
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I200b6aa12684d53e6ddddb333696423a4c351f67
2020-07-10 09:52:11 +08:00
Joseph Chen 496a6e1e02 make.sh: support get loader and trust ini from .config
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia68f394e19565af5e518387e356f58ac24e4b09e
2020-07-10 09:52:11 +08:00
Joseph Chen 124e8c0928 make.sh: support make config fragment
./make.sh rv1109 equal: ./make.sh rv1126_defconfig rv1109.config

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I26c9ea9ae753fc6465b1edb0fb1e7736fd4ede3e
2020-07-08 17:57:49 +08:00
Joseph Chen 0d7448d032 make.sh: fit: apply make_fit_boot.sh to make boot.img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I406d519725c750386784576416b662b448859f67
2020-07-03 08:58:06 +08:00
Joseph Chen 1a2ec6b5b5 make.sh: support assign compression
Use new args mechanism to call fit generator script.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifc74852d5de1b76ea103981e7a71c3cb5e12a961
2020-07-01 14:29:56 +08:00
Joseph Chen 89d0489d59 make.sh: support image size pack of ARMv7 platform
Without this patch, only ARMv8 and AArch32 support assign
image size.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I7d15d366251328ac2283172ef6f3a173298d451b
2020-06-28 10:57:38 +08:00
Joseph Chen 00dada44a9 make.sh: update tpl pack command
All available:
	./make.sh tpl-spl    --- pack tpl+spl
	./make.sh tpl        --- pack tpl
	./make.sh spl-s      --- pack spl
	./make.sh spl        --- pack spl

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iea58976bb7fc87775b8c3c1bd2c1fd151c6be51c
2020-06-23 10:24:26 +08:00
Joseph Chen f9976ae435 make.sh/fit: support pack without U-Boot
command: ./make.sh --no-uboot.

Providing empty file for mcu or U-Boot image if it's
not required.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I48650f6cc0bbcc9ed111fee0354ccafe4f6c1773
2020-06-15 14:25:53 +08:00
Joseph Chen 0732900259 make.sh: update tpl+spl pack command
Legacy command:
	./make.sh spl     --- pack tpl+spl
	./make.sh spl-s   --- pack spl

New command:
	./make.sh tpl-spl --- pack tpl+spl
	./make.sh spl-s   --- pack spl
	./make.sh spl     --- pack spl

Note: legacy command "./make.sh spl" was not appied on any SDK.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ib0a96c94dd6e8fc90184e62ff495dda68ecf571f
2020-06-15 11:40:50 +08:00
Joseph Chen cc0b1aa3fe make.sh: fit: append "-itb" postfix for args
"--uboot" => "--uboot-itb";
"--boot" => "--boot-itb".

In order to distinguish with "--no-uboot".

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4d1e1a3f88619fb728165764af52ca58665a5e89
2020-06-15 11:29:46 +08:00
Joseph Chen b42b4e1160 make.sh: clean up coding style
Not change any code logic.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If63da35728028de638a701635425cfa1f195dfde
2020-06-15 10:57:34 +08:00
Joseph Chen 1ff581bb9e scripts: fit: refactor code
- update coding style;
- simply some code logic.
- remove some unused file.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0246dcf5aae6bb73771406518fdaf622bfd9bb2b
2020-05-18 18:16:20 +08:00
Joseph Chen b6e67ca896 make.sh: merge all fit common args to a variable
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id485dd311c534260255cfb771b015d83ee401e80
2020-05-14 11:37:26 +08:00
Joseph Chen b53ffe05bf make.sh: fit: change "--new-spl" to "--spl-new"
use "--spl" as prefix in order to add more spl subcommands
in the future.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6e90e0a4b38030bf64bb25f87b6eb6b03f0000fc
2020-05-13 09:05:24 +08:00
Joseph Chen 43816dcece make.sh: fit: support "--boot_img" to sign image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2717acc851e7a07cdadfebccd46996238846c32e
2020-05-12 15:05:32 +08:00
Joseph Chen 9c00c79ad8 Merge branch 'next-dev' into thunder-boot 2020-04-29 09:52:58 +08:00
Joseph Chen 9b9964b191 make.sh: support pack loader with spl in rkbin
Use args: "--new-spl" to pack loader with current build one.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Idfb4ca4135194c4cfb9d42eb3af0aecfc31be108
2020-04-28 18:54:36 +08:00
Joseph Chen 7e0be77742 Merge branch 'next-dev' into thunder-boot 2020-04-27 18:03:41 +08:00
Joseph Chen b768b9152f make.sh: refactor code
- Mainly for refactoring args parse logic to support args
  without args order and relation requirement.
- Unify trust and loader ini file parse and available for
  all functions.
- Clean coding style.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9dae6b7e535bef8c5ca1c2542d89ee8e08cee715
2020-04-27 16:44:44 +08:00
Joseph Chen e0058109d4 Merge branch 'next-dev' into thunder-boot 2020-04-20 20:18:44 +08:00
Joseph Chen 4e45d60523 make.sh: remove file before build
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic87dc270a8e090c21eaae643cd9edb9e22cac767
2020-04-20 20:15:09 +08:00
Joseph Chen b0a6db3b4a Merge branch 'next-dev' into thunder-boot 2020-04-20 19:55:03 +08:00
Joseph Chen a11e2c8225 make.sh: simplify remove file
rm -rf can always return 0.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1f7e14ec860bb0da7b72132a8945a959b20cd440
2020-04-20 19:41:55 +08:00
Joseph Chen f9afd3dc76 make.sh: support fit secure image build with args
Such as:
    ./make.sh rk3399 --rollback-index-uboot 12 --rollback-index-boot 22
    ./make.sh --rollback-index-uboot 12 --rollback-index-boot 22

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ifd3d564bc860af215860471a327f752305501123
2020-04-20 18:29:25 +08:00
Joseph Chen 4b4c68413a make.sh: build secure or non-secure image auto by CONFIG_FIT_SIGNATURE
Providing sub command "fit-ns" to force building a non-secure image,
mainly for debugging.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0212dcb1c8387b16a4b0589d74cbc2ddeb282b3d
2020-04-20 18:29:14 +08:00
Joseph Chen 6084ba494f make.sh: fix finish message "make nopack_defconfig"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I387c6337d8d5ea8a2e68a289aff695f38ebfcd47
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 851015326d make.sh: support pack mcu by parameters
Parameters: mcu address offset and enable status.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id388bf0d94182a55781248a51d26de32ee03e7be
2020-04-16 15:41:28 +08:00
Jason Zhu 61481586b4 make.sh: support pack mcu.bin
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I0f7967e9bc969d9fe2452f070a8b597f40697b9f
2020-04-14 21:50:46 +08:00
Joseph Chen eee9fb0aea make.sh: fix typo
Fix trust.img pack failed issue.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icbaaba493228f620849851c46bb503dfe7ae6a13
2020-04-14 18:54:59 +08:00
Joseph Chen a873a53297 Merge branch 'next-dev' into thunder-boot 2020-04-14 14:16:56 +08:00
Joseph Chen 8f53a15c01 make/fit: optimise for fit
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I59067a208f3599f13acf995172ec720c1f141d18
2020-04-14 13:13:17 +08:00