diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-06-17 21:51:48 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-24 17:23:13 -0400 |
| commit | 6441e3deb429f218c05e6a71fbbb89e7519e2e52 (patch) | |
| tree | 3a2a6ddc1b74d8034801a3b34a79bc956a96ba5e | |
| parent | afedf5488de99925f00ead847e40d7ba0d508f0e (diff) | |
| download | u-boot-imx-6441e3deb429f218c05e6a71fbbb89e7519e2e52.zip u-boot-imx-6441e3deb429f218c05e6a71fbbb89e7519e2e52.tar.gz u-boot-imx-6441e3deb429f218c05e6a71fbbb89e7519e2e52.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/lib/bootm-fdt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 7677358..76b75d8 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; } |