Commit Graph

137 Commits

Author SHA1 Message Date
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
Joseph Chen a9017bd54b Merge branch 'next-dev' into thunder-boot 2020-04-13 19:38:06 +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 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 9d4243d397 Merge branch 'next-dev' into thunder-boot 2020-04-10 16:38:43 +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 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
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
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
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 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
Joseph Chen 5b7cca2ee0 make.sh: fix typo
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I812c619874daac186704f8f77d8b113ab272339e
2020-04-07 17:48:09 +08:00
Joseph Chen 162cc77ecd make.sh: support pack uboot.fit
uboot.fit = u-boot-nodtb.bin + u-boot.dtb + tee.bin

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I70ed43fa2ff37d3f9ac0dfef1321a9397901c73f
2020-04-07 12:59:44 +08:00
Joseph Chen d13b75e130 make.sh: itb: call raw command to build 32-bit platform itb file
We need pass TEE_OFFSET to its file.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8e59ad98c6b54535686a158a6c31e408fc59e7b0
2020-04-07 12:59:27 +08:00