| Message ID | 1525423751-4580-1-git-send-email-hannes.schmelzer@br-automation.com |
|---|---|
| State | Accepted |
| Commit | 7f1cb1d588789585aa962250fda4c3e095901c5b |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] bootm: fix 'memory-fixup' for vxWorks boot | expand |
On Fri, May 04, 2018 at 10:49:11AM +0200, Hannes Schmelzer wrote: > The check for having a memory node within the fdt blob is made wrong, we > fix this here. > > Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 91a64be..92780fd 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -438,7 +438,7 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); - if (off < 0) { + if (off > 0) { if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); }
The check for having a memory node within the fdt blob is made wrong, we fix this here. Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> --- arch/arm/lib/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)