summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-06-17 21:51:48 +0900
committerTom Rini <trini@konsulko.com>2016-06-24 17:23:13 -0400
commit6441e3deb429f218c05e6a71fbbb89e7519e2e52 (patch)
tree3a2a6ddc1b74d8034801a3b34a79bc956a96ba5e /arch
parentafedf5488de99925f00ead847e40d7ba0d508f0e (diff)
downloadtalos-obmc-uboot-6441e3deb429f218c05e6a71fbbb89e7519e2e52.tar.gz
talos-obmc-uboot-6441e3deb429f218c05e6a71fbbb89e7519e2e52.zip
ARM: move #ifdef to match the error handling code
Match the #ifdef ... #endif and the code, ret = do_something(); if (ret) return ret; This will make it easier to add more #ifdef'ed code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/lib/bootm-fdt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 7677358742..76b75d8e46 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -42,11 +42,14 @@ int arch_fixup_fdt(void *blob)
}
ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
-#ifdef CONFIG_ARMV7_NONSEC
if (ret)
return ret;
+#ifdef CONFIG_ARMV7_NONSEC
ret = psci_update_dt(blob);
+ if (ret)
+ return ret;
#endif
- return ret;
+
+ return 0;
}
OpenPOWER on IntegriCloud