diff options
| author | Thierry Reding <treding@nvidia.com> | 2019-03-01 19:20:48 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2019-04-11 20:10:05 -0600 |
| commit | 1ceb10b4d872b29ba251bc49665f1b8812d70acf (patch) | |
| tree | 38a261da5f227de8016d817fa5087ce2b7fe09e3 /common | |
| parent | d39e2bd0b09bc333561b26c1dc6f7d63bab6dbd2 (diff) | |
| download | u-boot-1ceb10b4d872b29ba251bc49665f1b8812d70acf.tar.gz u-boot-1ceb10b4d872b29ba251bc49665f1b8812d70acf.tar.bz2 u-boot-1ceb10b4d872b29ba251bc49665f1b8812d70acf.zip | |
fdt: Remove duplicate code
Commit 6d29cc7dcf2d ("fdt: Fixup only valid memory banks") ended up
being merged twice, first as:
commit 6d29cc7dcf2d35966aa0b6119fd1cbca0d21d5e6
Author: Thierry Reding <treding@nvidia.com>
AuthorDate: Tue Jan 30 11:34:17 2018 +0100
Commit: Simon Glass <sjg@chromium.org>
CommitDate: Sun Feb 18 12:53:38 2018 -0700
fdt: Fixup only valid memory banks
Memory banks with address 0 and size 0 are empty and should not be
passed to the OS via device tree.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
and later again, though this time it was v2:
commit ed5af03f9bb8905f1e94d68ab49f22d7f061d75f
Author: Thierry Reding <treding@nvidia.com>
AuthorDate: Thu Feb 15 19:05:59 2018 +0100
Commit: Tom Rini <trini@konsulko.com>
CommitDate: Fri Feb 23 10:40:50 2018 -0500
fdt: Fixup only valid memory banks
Memory banks with address 0 and size 0 are empty and should not be
passed to the OS via device tree.
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
The second version was slightly different, so the main hunk of the patch
was applied twice. This isn't harmful because the code is idempotent,
but it's wasteful to run the same code twice.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 42583e3ed8..ab08a0114f 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -456,12 +456,6 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks) if (!banks) return 0; - for (i = 0; i < banks; i++) - if (start[i] == 0 && size[i] == 0) - break; - - banks = i; - len = fdt_pack_reg(blob, tmp, start, size, banks); err = fdt_setprop(blob, nodeoffset, "reg", tmp, len); |