diff options
| author | Tom Rini <[email protected]> | 2020-10-24 10:49:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-24 10:49:28 -0400 |
| commit | c99e87f82803500f9811b1e98926d9d25df35b38 (patch) | |
| tree | 9ed4491e17a925e5d7a50ff21af8c33080f32ef1 /common | |
| parent | 001ab99325bf82cf3284771d1312585570569740 (diff) | |
| parent | 16cc5ad0b439b1444af8134019d9d49d776fd67c (diff) | |
Merge branch '2020-10-23-misc-changes'
Highlights:
- Fix a problem with the bootm overlap tests
- Remove duplicated code in fatwrite
- Cleanup our current "misc" command code and add a new one for misc
class devices.
- Various GPIO fixes
Diffstat (limited to 'common')
| -rw-r--r-- | common/bootm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/bootm.c b/common/bootm.c index b3377490b3e..167eea4a1e9 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -256,9 +256,11 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, /* check if ramdisk overlaps OS image */ if (images.rd_start && (((ulong)images.rd_start >= start && - (ulong)images.rd_start <= start + size) || - ((ulong)images.rd_end >= start && - (ulong)images.rd_end <= start + size))) { + (ulong)images.rd_start < start + size) || + ((ulong)images.rd_end > start && + (ulong)images.rd_end <= start + size) || + ((ulong)images.rd_start < start && + (ulong)images.rd_end >= start + size))) { printf("ERROR: RD image overlaps OS image (OS=0x%lx..0x%lx)\n", start, start + size); return 1; |