diff options
| author | Tom Rini <[email protected]> | 2019-03-08 18:04:13 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-03-08 18:04:13 -0500 |
| commit | e8e3f2d2d48f97b2c79b698eccedce8f4f880993 (patch) | |
| tree | dc92c94f1c2451050dbfe07c18909d27d621be90 /common | |
| parent | 606b239a6c60868da1767b973e5f9c3e6eae48fe (diff) | |
| parent | 279dc04f25538eb69f4377d73a9f2889a651cf5f (diff) | |
Merge branch '2019-03-08-master-imports'
- Assorted minor fixes:
- ARM: qemu-arm: enable USB boot in distro boot with UEFI
- image: fdt: handle coalesced reserve region
- cmd: thordown: Fix spelling of download.
- fdt: Fix FIT header verification in mkimage and conduct same checks
as bootm
- test: Update test-imagetools.sh to match new syntax
Diffstat (limited to 'common')
| -rw-r--r-- | common/image-fdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 94089b2215c..01186aeac7a 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -71,10 +71,10 @@ static const image_header_t *image_get_fdt(ulong fdt_addr) static void boot_fdt_reserve_region(struct lmb *lmb, uint64_t addr, uint64_t size) { - int ret; + long ret; ret = lmb_reserve(lmb, addr, size); - if (!ret) { + if (ret >= 0) { debug(" reserving fdt memory region: addr=%llx size=%llx\n", (unsigned long long)addr, (unsigned long long)size); } else { |