diff options
| author | Tom Rini <[email protected]> | 2019-04-27 10:42:36 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-04-27 10:42:36 -0400 |
| commit | 6b8e57338f3c5b65fa5b883fa3f87124f11a9e19 (patch) | |
| tree | 222892e528eed7e9785a444e765014fa320bba2b /tools | |
| parent | 07b68b7843ad1fa15d63dcd26b5ca5a053fcc27f (diff) | |
| parent | fc1fe01b08cedd77a194bb82fa81af4fe1e39031 (diff) | |
Merge branch '2019-04-27-master-imports'
- Various vexpress, taurus, da850evm, lpc32xx, brxre1 fixes/updates
- btrfs fixes
- Add AM65x HS EVM
- Other small fixes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 2 | ||||
| -rw-r--r-- | tools/dtoc/dtb_platdata.py | 5 | ||||
| -rw-r--r-- | tools/env/fw_env.c | 2 | ||||
| -rwxr-xr-x | tools/k3_fit_atf.sh | 8 |
4 files changed, 12 insertions, 5 deletions
diff --git a/tools/Makefile b/tools/Makefile index d377d85f74e..12a3027e234 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -150,6 +150,8 @@ endif # MXSImage needs LibSSL ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) +HOSTCFLAGS_kwbimage.o += \ + $(shell pkg-config --cflags libssl libcrypto 2> /dev/null || echo "") HOSTLOADLIBES_mkimage += \ $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py index ca580b45d4a..17a3dccb116 100644 --- a/tools/dtoc/dtb_platdata.py +++ b/tools/dtoc/dtb_platdata.py @@ -450,8 +450,9 @@ class DtbPlatdata(object): self.out('};\n') for alias, struct_name in self._aliases.iteritems(): - self.out('#define %s%s %s%s\n'% (STRUCT_PREFIX, alias, - STRUCT_PREFIX, struct_name)) + if alias not in sorted(structs): + self.out('#define %s%s %s%s\n'% (STRUCT_PREFIX, alias, + STRUCT_PREFIX, struct_name)) def output_node(self, node): """Output the C code for a node diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index a5d75958e1b..1ed0f7e9cb9 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1566,7 +1566,7 @@ int fw_env_open(struct env_opts *opts) free(addr0); if (addr1) - free(addr0); + free(addr1); return ret; } diff --git a/tools/k3_fit_atf.sh b/tools/k3_fit_atf.sh index 430b5ca616a..4e9f69c0878 100755 --- a/tools/k3_fit_atf.sh +++ b/tools/k3_fit_atf.sh @@ -21,6 +21,10 @@ if [ ! -f $TEE ]; then TEE=/dev/null fi +if [ ! -z "$IS_HS" ]; then + HS_APPEND=_HS +fi + cat << __HEADER_EOF /dts-v1/; @@ -51,7 +55,7 @@ cat << __HEADER_EOF }; spl { description = "SPL (64-bit)"; - data = /incbin/("spl/u-boot-spl-nodtb.bin"); + data = /incbin/("spl/u-boot-spl-nodtb.bin$HS_APPEND"); type = "standalone"; os = "U-Boot"; arch = "arm64"; @@ -66,7 +70,7 @@ do cat << __FDT_IMAGE_EOF $(basename $dtname) { description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); + data = /incbin/("$dtname$HS_APPEND"); type = "flat_dt"; arch = "arm"; compression = "none"; |