Commit Graph

154 Commits

Author SHA1 Message Date
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
Joseph Chen b4e157ffa2 make.sh: add version for spl loader
before:
  rk3399_loader_v1.24.124.bin => rk3399_loader_spl.bin

after:
  rk3399_loader_v1.24.124.bin => rk3399_spl_loader_v1.24.124.bin

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If5bcc02504760d178557d8db78889074fcad0427
2020-04-03 17:54:47 +08:00
Joseph Chen 622ccf343f make.sh: support assign U-Boot dtb with external one
Usage: ./make.sh EXT_DTB=rk-kernel.dtb

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I83218f5bb2f8e05d895d57fd344f54a01b6ad789
2020-02-28 11:20:23 +08:00
Joseph Chen 67a616b84e make.sh: generate individual loader file for subcommand "spl-s"
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2b2d58b1b753928113317b64fb34d65dec92fdaa
2020-02-24 15:05:35 +08:00
Jason Zhu 708c86adb9 make.sh: support make.sh spl-s
make.sh spl-s : pack loader only replace miniloader with u-boot-spl.bin

Change-Id: I68df1961051d1f970bcb460ea362df3c15f403ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2020-02-14 11:40:52 +08:00
Joseph Chen 398d3e80fb make.sh: add sub command to build envtools
command:
	./make.sh env

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I8736042dd31da17f9998dae969d5f607c42ec563
2019-12-24 20:52:18 +08:00
Hans Yang 64ba9ad7e9 make.sh: support rk3036 build trust.img/uboot.img 512KB
Change-Id: I71360722bfbf16dcafd54b7a2d14fff2fc5bc5d1
Signed-off-by: Hans Yang <yhx@rock-chips.com>
2019-12-24 16:52:36 +08:00
Joseph Chen 85975b101c make.sh: add big endian sha256 for rk3368h
Should be the same as rk3368, otherwise the loader will
verify trust.img failed when secure boot is enabled.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I25ba5b7ad8a1673e09db1167ff780fe0c8c5a95f
2019-12-24 16:04:00 +08:00
Joseph Chen fcccd23a11 make.sh: move debug command to scripts/rkpatch.sh
Change-Id: Ie9eba5a585b78c92ee56f2fca9ac412ab5068ffa
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-12-10 16:45:54 +08:00
Joseph Chen d6e1155e0c make.sh: remove "all" mode for loader and trust
This is a early function, we can assign the ini file now:

./make.sh loader <ini>
./make.sh trust  <ini>

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I35e02a155ca622003af717f4b9ccf76741d7576e
2019-12-10 16:45:54 +08:00
Joseph Chen d6821889df make.sh: remove "O=<dir>" support
It seems useless at the most time and makes this
script complicated.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I157c7e036451dae79453706bbfcc81860686bfe5
2019-12-10 16:45:54 +08:00
Joseph Chen 783f7f6ecf make.sh: add rk1806 build support
Build cmd: ./make.sh rk1806

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If04fd324b4ce8e196e711e50275dd26b0919655b
2019-11-29 17:05:35 +08:00
Joseph Chen cd6239260c make.sh: ignore warn/error message of command 'ls'
fix: "ls: cannot access trust*.img: No such file or director".

Change-Id: Iabecb6b751dd3ba3f25fe725dac17cf4b7c39801
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-28 10:34:27 +08:00
Joseph Chen ca69da8403 make.sh: fix missing create .temp folder after delete
Change-Id: I05ffb3f518a96158bbd0940287d79ce73610b2c4
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-10-15 11:20:15 +08:00
Joseph Chen f3d602457f make.sh: add more help information
Change-Id: I8ed016767d8d7d0cd8dd533ce384715ad8d8afab
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-07-11 10:35:30 +08:00
Joseph Chen 34bdfea0a0 make.sh: support objdump tpl/spl elf file
Example:
	./make.sh elf tpl  --- objdump u-boot-tpl
	./make.sh elf spl  --- objdump u-boot-spl
	./make.sh elf      --- objdump u-boot

Change-Id: I8dca1cfce207b98e755db8841f3d614cfad9bfb4
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-06-21 18:15:56 +08:00
Joseph Chen 0d0d4395c1 make.sh: support pack u-boot.itb for 32-bit platform
Change-Id: I4e7a8f0b334ba39034943f6c1667259d446ea5d4
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-06-19 21:56:04 +08:00
Joseph Chen dd590c9364 make.sh: support assign ini file for packing loader/trust/spl-s
Example:
	./make.sh loader ~/rkbin/RKBOOT/RK3399MINIALL_SPINOR.ini
	./make.sh loader ~/rkbin/RKTRUST/RK3308AARCH32TRUST.ini
	./make.sh spl-s ~/rkbin/RKBOOT/RK3399MINIALL_SPINOR.ini

Change-Id: Ie373857befdf030a1b816de629dd38d6be1fc920
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-06-19 14:52:05 +08:00
Joseph Chen 224307fea3 make.sh: fix "ls: cannot access *_loader_*.bin: No such file or directory"
Change-Id: I46885f5a59a4ecfa25ad2ab95965732edbb722fe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-06-14 10:45:51 +08:00
Joseph Chen daa3bef505 make.sh: support pack spl/tpl loader and u-boot.itb
Usage:
	./make.sh spl		--- pack tpl+spl
	./make.sh spl-s		--- pack spl
	./make.sh itb		--- pack u-boot.itb

itb: Only support pack bl31 into u-boot.itb on 64-bit platform.

Change-Id: I2279ec8c961208160c324a6ade8afe9b8f2713f8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-06-14 10:44:55 +08:00
Joseph Chen 039bc38d48 make.sh: add rk3326 aarch32 build support
Change-Id: Ibfc6a40b5d0decbffdbf4e797459da189484ce88
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-28 20:30:40 +08:00
Joseph Chen 5202fe1fb4 make.sh: improve aarch32 build
Change-Id: I7e39b0cb71a534cf073d38f2bab28069dbad1b26
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-28 20:30:40 +08:00
Joseph Chen 05b87a4eed make.sh: remove exist image before pack
Change-Id: Iea5083970bbd332ec62250a6d1e35ac09dbed533
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-27 10:04:13 +08:00
Joseph Chen 69cce37bfc make.sh: support "./make trust-all" command
support parse "ADDR" and "OUTPUT" from *TOS.ini

Change-Id: Ie98d858c832eecd7736cf3b4a020dfc91b10241c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-05-22 15:34:12 +08:00
Joseph Chen b54b76f12a configs: add rknpu-lion_defconfig
Change-Id: I89d2cc39febbfd4cab8373f0be6f437957c6b758
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-18 15:20:26 +08:00
Joseph Chen 0436a29d64 make.sh: use "${RKCHIP_LOADER}MINIALL*.ini" to match ini files
clean: use variant "ini" for default MINIALL.ini path

Change-Id: Ia1583a915ebbbc4ec5299b9ef6d81b04592bd04b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 15:35:00 +08:00
Joseph Chen f089d907de make.sh: add max limit size check before packing uboot.img
The uboot.img header is 2KB size.

Change-Id: Ia99b71740423a5809233a3401f5a8698ae463749
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-04-11 15:34:03 +08:00
Joseph Chen 623d03d621 make.sh: pack ta trust.img as primary choice
This U-Boot is working with kernel-4.4 at least which
requires trust.img with ta.

It also avoids user confused with trust.img and trust_with_ta.img.

Change-Id: I18ec538a1f83cbb660e2fda597bf8120863d744f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-03-29 18:26:22 +08:00
Kever Yang daa679a7e4 rockchip: make.sh: get CONFIG_SYS_TEXT_BASE from .config
CONFIG_SYS_TEXT_BASE define in header file has be deprecate on
mainline, it has been move to Kconfig.

Change-Id: I40ae0ab84dbc6d74eca3450413fc2d11eb098434
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-27 18:10:36 +08:00
Kever Yang 903381d2b2 make.sh: support PX5
Update rule to support PX5

Change-Id: I67660165d78eb388e047fbf2189e493265dd45ad
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-03-26 11:53:52 +08:00
Kever Yang 2e08e06962 rockchip: make.sh: convert chip id RV1108 to RV110X
Change-Id: I93ff273109bcccdb499957dd1b02a5dcca941acf
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2019-02-14 17:35:31 +08:00
Joseph Chen 2ba1365e25 make.sh: support "--ignore-bl32" for trust_merger
Change-Id: I8428787c7218b3dd546283f6b5888d09a35623e7
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-13 16:58:20 +08:00
Joseph Chen f7bec22852 make.sh: add copyright and license
Change-Id: I9f5fcfe33134e901a77899f70a103d1a3fda26cd
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-02-13 10:38:27 +08:00
Jianqun Xu 16489ccd87 make.sh: decrease rk1808 uboot and trust backup copies to save space
- 1MB * 2 copies;
- on RK1808X4 board, only 32MB norflash space;

Change-Id: I9154989303e5a8f55e17d139f2674a5321324137
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-01-02 10:05:23 +08:00
Joseph Chen c9eb255473 make.sh: add debug command to enable bootstage timing report
Change-Id: I3550de5beb985932fff294953bda4b315805b7ea
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-12 11:54:31 +08:00
Joseph Chen d60cbc66d7 rockchip: add rk3399pro project build
build command: ./make.sh rk3399pro

Change-Id: I50d4aba026d35ff7ed73257dc1edcb50426aa64f
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-11 09:34:57 +08:00
Joseph Chen 59c7ef16b3 make.sh: clean debug commands to a function
Change-Id: Ia141a0830428ae51d9dd45da80a61d3805f62f4a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-10 15:13:19 +08:00
Joseph Chen 5c90ec81f3 make.sh: add debug command to enable printf for firmware bootflow
Change-Id: Iff523db0ecc26ca09d9a62e867031abfd85a3b42
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-12-07 14:05:31 +08:00
Joseph Chen 01a0b7a601 make.sh: using wide range match for all loader ini
Change-Id: I1d4f63ed0685816f0b41796ac10bdafae068eee2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-11-19 20:06:10 +08:00
Joseph Chen 363be87749 make.sh: add debug subcmd to print entry warning "UUU..." in start.S
Change-Id: Icac8e2479dbc11283e1e53cee430e479e401a710
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-10-19 17:40:56 +08:00
Joseph Chen ebdb223312 make.sh: rk1808 support RSA-PKCS1 V2.1 pack for trust
Change-Id: I9b27795c339516198cb2b499c2796ff7a7ef0b11
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-10-18 10:32:18 +08:00
Joseph Chen fc99e0440b make.sh: support parse address with reloc offset
Usage:
	./make.sh [reloc_addr]-[reloc_offset]

Example:
	./make.sh 7fe8fb88-7f88d000(same as: ./make.sh 602b88)

Change-Id: I08bb733702d18ddea89127e8d8f2db71faabe95c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-10-07 10:22:42 +08:00
Joseph Chen 1b6c85a0df make.sh: add debug-N sub commands
this command is mainly for debugging.

Usage:
	./make.sh debug-N

Example:
	./make.sh debug    ------ for debug help
	./make.sh debug-1  ------ enable case1 debug
	......

Change-Id: I1a0b063863cbdfc2be6bcc33da9c08f6d7536b3e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-10-07 09:24:07 +08:00
Joseph Chen 23ba6841cc tools: rockchip: support hostprogs for pack tools
- include: boot_merge/trust_merge/loaderimage/resource_tool/checksum;
- porting from rkdevelop and base on commit 8fd1d8f
  (resource: get resource primary from boot partition);
- clean generated binary file when execute clean command;

Change-Id: I41c1893c2da0a0f25c2d39dbbd933f89fbb04948
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-28 10:12:53 +08:00
Joseph Chen 3776a9bd6f make.sh: add rk399pro-npu build
Change-Id: I96c8dd6dc07c65549860631ecd70416f8f2f492e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-17 10:04:17 +08:00
Joseph Chen f0aa0521c2 make.sh: support rk3368h image pack
Change-Id: Iaa7a3c117bd5cffd24febe06f0af2a8a7316f37e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-08-09 14:58:53 +08:00
Shunqian Zheng 596700d74b make.sh: fix the broken of px3se loader/trust packing
PX3SE loader/trust packing was broken since
  d443b7d make.sh: parse RKCHIP from .config

This fixs px3se building with previous commit. And since we're
here, detecting the variant gracefully.

Change-Id: I5c7f5385a4cfd0d6beba842bd4766b77d8f67d88
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-07-27 09:06:10 +08:00
Joseph Chen de440615aa make.sh: support specify table to assign index name of loader/trust ini file
add gva-rk3229_defconfig to specify table

Change-Id: I347b4d43fa241f75f7aa95897369174ec6229e3d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-25 14:28:45 +08:00
Joseph Chen ce99549180 make.sh: add rk3128x support
Change-Id: I44a409e519c520cb6da5088a45b2ae197cda632d
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-24 16:40:40 +08:00
Joseph Chen 7070f875d9 make.sh: support hex prefix with "0x" or "0X" for <addr> subcmd
Command:
	./make.sh <addr>

Change-Id: Iea2cf4009ed39989796a15556490db70b12696fc
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-10 20:31:25 +08:00
Joseph Chen 6a7642592a make.sh: update help info
Change-Id: Ia3a56c4173184a1871ab765c661726fb1fc66d2c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-10 20:31:25 +08:00
Joseph Chen 5c75ab41e7 make.sh: support pack all loaders
Command:
	./make.sh loader-all

Change-Id: I458c30f6505eaace52858254277905e163255fa2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-10 20:31:25 +08:00
Joseph Chen 53ea579188 make.sh: support get function symbol and addr2line
Command:
	./make.sh [func address]

Example:
	>> ./make.sh 000000000024fb1c

	>> 000000000024fb1c l     F .text  000000000000004c spi_child_pre_probe
	>> /home/guest/u-boot/drivers/spi/spi-uclass.c:153

Change-Id: I6f413631fad6c51a79a35d3794d636fec6beef5b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-09 20:01:44 +08:00
Joseph Chen d9d90a7304 make.sh: pack all loader image for target platform
mainly for rk3399 ini files:
	RK3399MINIALL.ini
	RK3399MINIALL_SPINOR.ini

Change-Id: I025c98c2cb0a4e8d6070efe1999797c90b113036
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-03 10:52:29 +08:00
Joseph Chen b62551987d make.sh: clean up
1. improve help description;
2. support subcmd without [board] option;
3. imporve 'O=<dir>' support;
4. imporve code format;

Change-Id: I7bb0d6176ce856750cfbcd234edfb8b237ea424a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-07-03 10:52:29 +08:00
Joseph Chen d443b7d532 make.sh: parse RKCHIP from .config
this makes RKCHIP non relative about build command,
but we have to do special fixup for rk3326 and rk3126
board defconfig, because they contain px30 and rk3128
in the .config file.

Change-Id: Ia1974f2c8961b0a698d32f45effa4ddfe4177b0b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-25 17:08:56 +08:00
Joseph Chen c88f435110 make.sh: show original chip name for build message
Change-Id: I383c44d760f1670143aa8437597606902bbc10fa
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-13 20:49:25 +08:00
Joseph Chen 30b04afc78 make.sh: support "./make.sh" build without [board] option
this default use exist .config to build project. because users
maybe don't like their .config to be override after "make menuconfig"
change.

Only one SoC in the .config is allowed, otherwise still use
"./make.sh [board]".

Change-Id: Ib65a4b6d6f84b822f6bdaf84b9784521fbf200e9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-13 20:36:17 +08:00
Joseph Chen fb90bd1d33 make.sh: clean up code
Change-Id: If6379bc4c9c5b177f4997791324ad2665fcb6b11
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-13 10:56:38 +08:00
Joseph Chen 41cf5e5a16 make.sh: clean up platform fixup configures
1. move all platform fixup together in fixup_platform_configure();
2. Support rk3308 build trust.img/uboot.img AArch32 1MB and AArch64 2MB.

Change-Id: I02cf51bc8e01317caee0d6de157d832ef133ab4c
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-13 10:56:38 +08:00
Joseph Chen a64486b542 Revert "make.sh: support rk312x trust.img pack"
This reverts commit b45ec7ccd8.

Due to commit d77daa4 in rkbin project, which supports muitiple filesystem,
so we don't need this patch any more.

Change-Id: I73fab6f865a8428c9ecf41406fd5bbeffe6920cc
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-13 10:56:38 +08:00
Joseph Chen 1ba474786a make.sh: support pack ARM64 AArch32 trust.img
Change-Id: Ic04bc1624505200989301c904194a41b043ec16b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-06-01 15:28:12 +08:00
Joseph Chen fa400ae59c make.sh: support pack trust.img that ARM64 cpu boot on AArch32
Change-Id: I5207c644284b686513d3d3536e4032d0980f9112
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-25 15:37:37 +08:00
Shunqian Zheng 80fb8d2c35 Revert "rockchip: add px3se evb board support"
Another px3se evb dts/config will upload instead.

This reverts commit a5c82e2bba.

Change-Id: Iad3878b1cb1feb032c14252a90a59fc3070dafff
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2018-05-23 11:19:42 +08:00
Joseph Chen a5c82e2bba rockchip: add px3se evb board support
Change-Id: If1ab2bc8f166833ea882a0d4d134eb5c05151462
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-16 15:24:06 +08:00
Joseph Chen b45ec7ccd8 make.sh: support rk312x trust.img pack
generate both trust_nand.img and trust_emmc.img

Change-Id: I736679f1544d1804487995d6eafbc876bec78bbe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-16 15:24:06 +08:00
Joseph Chen 7f3c4f741c make.sh: use rk big endian SHA256 for rk3368 trust.img pack
rk big endian sha256 pack magic is "2", so use "--sha 2" subcmd

Change-Id: I1a31712f808aaff7f9213ea6f1a7ca15fe3012c2
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-11 11:52:07 +08:00
Joseph Chen e5e978b341 make.sh: use RSA PKCS1 V2.1 for RK3308/PX30/RK3326 trust.img pack
RSA PKCS1 V2.1 pack magic is "3", so use "--rsa 3" subcmd

Change-Id: Ic35445445121d765385f5cf9673473b061633a3a
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-11 11:12:35 +08:00
Joseph Chen 7c19369d03 make.sh: delete unused similar files and add support list show
Change-Id: I24b1a05f6a321d2f409c25822b7dbbba5e1ae6d6
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-05-11 11:12:35 +08:00
Andy Yan 67191cb0fa make.sh: add prefix / for u-boot.img & u-boot-dtb.img
We can set a special build output dir for ${OUTDIR}
by argument -o, so the correct way to locate a output
object is ${OUTDIR}/obj.

Change-Id: I894b44d703afe2d21fcf7dddfbb82ae943835021
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2018-05-08 11:35:43 +08:00
Joseph Chen a43a18b23b make.sh: add subcmd to pack trust and loader
We don't want uboot.img compile everytime if we just want to
pack trust or loader.

Example:
	./make.sh evb-rk3308 trust	------ only pack trust
	./make.sh evb-rk3308 loader	------ only pack loader

Change-Id: I9d940eefba99074c155c978cbc0ba838160f65d9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-04-23 15:47:21 +08:00
Joseph Chen 90b0cf64a7 make.sh: delete u-boot.img and u-boot-dtb.img
this avoids users to be confused with uboot.img

Change-Id: Ifdbb1c483825ef065708ca81da3496bde3358e21
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-04-18 10:10:03 +08:00
Joseph Chen 92f26f7214 make.sh: fix typo "RKRUST" -> "RKTRUST"
Change-Id: Ia824691d68521652c4a5a7d03a5080b57a8ae7b9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-03-05 10:55:43 +08:00
Joseph Chen 2ce00756b4 make.sh: remove RKCHIP fixup for PX30
PX30 and RK3326 would have their individual ini files.

Change-Id: I3e8f05b34ee9a38429fd2870f635328eaf6b5f59
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-27 18:04:45 +08:00
Joseph Chen 366bd23fdb make.sh: make assign output directory cmd as an option
default use current directory as output dir, you can also
assign output dir by command "O=[directory]".

Example:
	./make.sh evb-px30 O=rockdev

Change-Id: I1a7efb7a273d147d81b7fa9bb0bbbe00a8f5d12e
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-24 11:51:00 +08:00
Joseph Chen 2ecf1e82ef make.sh: fixup RKCHIP from 'PX30' to 'RK3326'
This is for INI file look up

Change-Id: Iac3ee79c12d9c5c51484e41533346fbc4acf4215
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-11 17:46:30 +08:00
Joseph Chen 07de173ac2 make.sh: add subcomand "map" and ".config"
Example:
	./make.sh evb-px30 map		---- edit System.map
	./make.sh evb-px30 .config	---- edit .config

Change-Id: Iba731a07a4da9cd56c2099237620358dc4967315
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-11 11:57:13 +08:00
Joseph Chen d8540eac21 make.sh: update gcc toolchain to version 6.3.1
32-bit: gcc-linaro-6.3.1-2017.05-x86_64_arm-linux-gnueabihf
64-bit: gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu

Change-Id: Iafe288a640ed61362fda4845ca169b677c6b7e35
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-11 11:57:13 +08:00
Joseph Chen 0ff0e21444 make.sh: support a lot of sub commands
1. make clean, make distclean and make mrproper;
2. objdump elf file;

Append 'clean', 'distclean', 'mrproper' or 'elf' to build command

Example:
	./make.sh evb-px30 clean
	./make.sh evb-px30 distclean
	./make.sh evb-px30 mrproper
	./make.sh evb-px30 elf

you can also use 'elf[option]', like: 'elf-D', 'elf-d', 'elf-S'...
[option] is not necessary(default -D), it would be used as objdump
command option.

Change-Id: If6402ee9b0f9bd79aa7f18703ce0061106b11e26
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-09 14:25:57 +08:00
Joseph Chen 51441a2851 make.sh: fix issues
1. check INI input file exists;
2. fix up commit 7c2526e;

Change-Id: I7053c975369945a02034a108d8cab096aa35f142
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-03 12:53:55 +08:00
Joseph Chen d93242f238 make.sh: pack uboot.img as first order
Change-Id: I4bb55f8cedf476be5cd3418650c970c10d1d0069
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-02 21:30:13 +08:00
Joseph Chen 7c2526e987 make.sh: execute "make mrproper" when first compile
fix compile issue while git checkout between rkdevelop and next-dev:

  Using /home/cjh/uboot-nextdev/u-boot as source for U-Boot
  /home/cjh/uboot-nextdev/u-boot is not clean, please run 'make mrproper'
  in the '/home/cjh/uboot-nextdev/u-boot' directory.
make[1]: *** [prepare3] Error 1
make[1]: *** Waiting for unfinished jobs....

Change-Id: If9e01b407f524360ff402d8d36241f3885c90c48
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-02-02 14:48:50 +08:00
Joseph Chen bc98b3c8fc make.sh: optimize code
1. use global variables for important definitions, easy to update;
2. add more error message warning;
3. fix some issues.

Change-Id: I702f4efe5839c1c7eaf66f412011aadf6627f323
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-29 10:31:06 +08:00
Joseph Chen 0e90839a14 make.sh: update package command
boot_merge and trust_merge support command "--replace".

Change-Id: Ie5cf52a1aaefcc717fcb76400e2f0eb8dfc8f467
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-01-26 20:39:00 +08:00