Commit Graph

760 Commits

Author SHA1 Message Date
Joseph Chen 4b1cd58cd0 scripts: fit: support sign recovery.img
Add args:
	--recovery_img
	--rollback-index-recovery
	--version-recovery

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iabd9a78155f1d6e10b9539bb9fee6d17153b8074
2021-02-02 17:06:43 +08:00
Joseph Chen 374d259683 scripts: fit.sh: add more comments
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia283f3abad0afe683db073a8fc1fc9220f796e09
2021-01-22 15:06:53 +08:00
Jianqun Xu bd3ad955a3 scripts/dtc: phandle index start from 0x1000000
Change-Id: I1141545e4592bfebf812f2477d1851d178ee8bd8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-01-18 10:24:07 +08:00
Joseph Chen e156df4354 scripts: fit: validate image type of source file
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Id04a4ef397fe19ffac3f09daeea6c5ebc9294dcd
2020-12-31 18:19:44 +08:00
Joseph Chen 1d22de7f19 rockchip: rv1126: rename periph device region
Adding to whitelist.txt:
	CONFIG_PERIPH_DEVICE_START_ADDR
	CONFIG_PERIPH_DEVICE_END_ADDR

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ia07a467489e52b7580351829768437dc67e71833
2020-12-30 17:48:20 +08:00
Joseph Chen b800cd5a0c Revert "scripts: fit.sh: remove unused property but not initial as 0"
This reverts commit f269c7e952.

Reason: It breaks software RSA verify.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2dd1676d57c3860f3d278ef61935c9e77435a30e
2020-12-30 17:02:32 +08:00
Joseph Chen 3bcf0b7c0e scripts: pack_resource.sh: support android and fit image
./scripts/pack_resource.sh boot.img
./scripts/pack_resource.sh recovery.img

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I067b00ecbadaab78962605e0caa03e04ff4f3c02
2020-12-18 18:02:35 +08:00
Joseph Chen b71a17c51e scripts: pack_resource.sh: clean up
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4b994653b1959c0c70507b524da37d9cb483c21d
2020-12-18 18:02:35 +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
Wenping Zhang 0466543ca9 tools: add tools for convert bmp to gray16 and saved as logo.img.
This tool support convert 16bpp/24bpp/32bpp bmp images into
4 bits grayscale image, and add header info to save as logo.img.
logo.img is flash into emmc and parsed in uboot to display
uboot/charging/lowpower/kernel logo.
[Note]the requirement of bmp files:
1. The resolution of all bmp image must be same.
2. The logo.img will be parsed in uboot, the uboot require the resolution
   of image must be same as screen resolution, otherwise will be failed.
3. The color depth of bmp image must be 16bpp/24bpp/32bpp, 8bpp is not supported.

The usage:
./tools/bmp2gray16 --uboot-logo tools/images/eink/uboot.bmp --kernel-logo tools/images/eink/kernel.bmp
--charge-logo tools/images/eink/battery_0.bmp tools/images/eink/battery_1.bmp tools/images/eink/battery_2.bmp
tools/images/eink/battery_3.bmp tools/images/eink/battery_4.bmp tools/images/eink/battery_5.bmp
tools/images/eink/battery_fail.bmp --output ./logo.img

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Ifc39f0344693fb0b26b04d7904289847e6fa9b90
2020-12-10 17:51:14 +08:00
Joseph Chen 8d853b0626 scripts: fit.sh: add "burn-key-hash = <1>" in u-boot-spl.dtb
The property path: /signature/key-dev/burn-key-hash.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I6a9058d5f63ac4d98c863eaa9b726aa1deb1fb14
2020-12-10 15:40:26 +08:00
Joseph Chen 134814e52f scripts: fit.sh: remove unused hash node of rsa key
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I9117428f812ed00f9b78971d2cabcf1e71aa0989
2020-12-10 15:40:26 +08:00
Joseph Chen f269c7e952 scripts: fit.sh: remove unused property but not initial as 0
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3af669575ae53cd7cc72e307a07057a95b3b8955
2020-12-10 15:40:26 +08:00
Joseph Chen 14aa40ff18 scritps: fit: add "--burn-key-hash" support
It sets "burn-key-hash = <0>" to "burn-key-hash = <1>" which
enables SPL burn root-key hash to OTP.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I65f4b8f3603fff25d42b576b65ea86733d60ae56
2020-11-26 14:44:34 +08:00
Joseph Chen 4129064579 scritps: fit: use more strict replace pattern for "rolback-index"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icfc23e1f7338842a565be5b691a8f14e003d1644
2020-11-26 14:44:34 +08:00
Joseph Chen ede15112c2 scripts: fit-msg.sh: read components image message
Support get commit version of components image.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic279ed457949a98693571ec2a8ff2cfac4e0469d
2020-11-14 09:00:35 +00:00
Joseph Chen d4f6d8e395 scripts: android2fit.sh transform Android image to FIT image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0c448d101aa4912398efa528275119132f434f69
2020-11-14 08:28:45 +00:00
Joseph Chen 125d49da41 scritps: fit-repack: clean coding style
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ic6284cd161eba58d1fad3f33f56eababbacca487
2020-11-09 21:23:41 +08:00
Joseph Chen b3561c89c7 scritps: spl.sh: support new idb pack
Change-Id: I86d82c7358810aa7a7ee21133bdacf58716a5802
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2020-11-06 18:21:26 +08:00
Masahiro Yamada daae0a01d6 UPSTREAM: host-tools: use python2 explicitly for shebang
All of these host tools are apparently written for Python2,
not Python3.

Use 'python2' in the shebang line according to PEP 394
(https://www.python.org/dev/peps/pep-0394/).

Change-Id: Ie56e538b0f4a234fccb460adbfd863db0712a1b0
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 94b13bbae90bfb94204b8fe9c531bc163e746a9f)
2020-11-02 21:26:47 +08:00
Joseph Chen d6babb00c3 scripts: fit: support "--boot_img_dir" args for boot.img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2b1648a673492cade1c0a3f499f46f1ff072251a
2020-10-30 18:13:59 +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 c4e6abcd5e scripts: rkpatch: update patch order
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3bdfe4d05a9985e22fa5bac790d823f5ff4325ec
2020-10-28 21:23:07 +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 34df577a5d scripts: fit-repack.sh: fix cp issue
cp: omitting directory ‘out/repack’

Ignore directory.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I4ebca3319b290a7eab9f4b51e9338a0cb3c6c10f
2020-09-15 11:47:28 +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 3ed9fa58e7 scripts: fit: move its file to fit/
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If8b887ebaf63573b3c7c414873e038c1f67e4111
2020-07-13 20:41:52 +08:00
Joseph Chen 7d33ddceab scripts: sync-fragment: use "mv" instread of "cp"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I91365eb455ff4b79253a8666571c42847d96090e
2020-07-10 15:14:41 +08:00
Joseph Chen d07fced289 scripts: sync-fragment.sh: support nested
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I37605b2c65c0908aeda20e8a5551c2e630a49732
2020-07-10 10:39:39 +08:00
Joseph Chen bc0a7e781e scripts: add script to support repack fit
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I5e132193c62b1ff85ec5248668a74636c0b13165
2020-07-09 11:47:03 +08:00
Joseph Chen 1de0df4512 scripts: fit: support set image version of uboot.img and boot.img
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I1fafa347e3b3f53d4987b145642bb96726870ee3
2020-07-09 09:24:07 +08:00
Joseph Chen 8d2c0f5ee8 scripts: add a script to sync/add conifg fragment
Example:
	./scripts/sync-fragment.sh configs/rv1109.config

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I04bc6c0f3615edafcbdb57b91de73162a912838f
2020-07-08 17:57:49 +08:00
Joseph Chen b8561139ba scripts: add diffconfig from kernel project
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iade4d1d7180863f9e110e9ecd60cef63c40e1426
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 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 5e23d42422 scripts: fit: add a macro for "data2sign.bin"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie36551e14f74c6c1a09012f02de5a48bd4dae888
2020-06-15 11:29:46 +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 32ccc236e9 scripts: fit: update uboot.img packing message
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I60f573df2fe73bba7ca9941f3431a6bda020b490
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 6402f0407c scripts: fit: support repack rollback-index version
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3b183e6a7868a5a769d41179f62a5ec0a23b41f5
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 f3797579f0 scripts: fit: support repack boot itb image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I3e529dd9c274196a633a77829d554b2625a77264
2020-05-12 15:05:42 +08:00
Joseph Chen ae994be4c1 scripts: fit: support "--boot_img" args to sign image
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0ce040df7b66089462d19a63e144f28ce9cc7fc1
2020-05-12 15:02:47 +08:00
Joseph Chen 436376efb7 scripts: fit: support unpack its from itb file
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0bec62cc6ba31b2c7e7293f32f751e4a639c7917
2020-05-12 15:02:47 +08:00
Joseph Chen 5facc6b84e scripts: fit: update variant name
Use upper case.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icd3a42c897c93ceaed593906bbda12bd9d2e663e
2020-05-12 15:02:47 +08:00
Joseph Chen ca6206136c scripts: fit: fixup "arch" property for arm64
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Ie45b89215bd5ae636e4753fc47bfb60a3829b40f
2020-05-12 15:02:47 +08:00
Joseph Chen fe3372b265 scripts: fit: 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: I194a7df4a258f473bfa94aa949a33ea7d06ffbde
2020-04-28 18:54:34 +08:00