diff mbox

[U-Boot,v2] ARM: fix ifdef in ARMv8 lowlevel_init() again

Message ID 1463713990-9963-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Masahiro Yamada May 20, 2016, 3:13 a.m. UTC 
Commit 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
accidentally inverted the logic of CONFIG_ARMV8_MULTIENTRY.

Fixes: 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2:
  - Rephrase subject

 arch/arm/cpu/armv8/start.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stephen Warren May 20, 2016, 4:15 p.m. UTC | #1 
On 05/19/2016 09:13 PM, Masahiro Yamada wrote:
> Commit 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
> accidentally inverted the logic of CONFIG_ARMV8_MULTIENTRY.
>
> Fixes: 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Stephen Warren <swarren@nvidia.com>

Sorry:-(
Tom Rini May 23, 2016, 10:14 p.m. UTC | #2 
On Fri, May 20, 2016 at 12:13:10PM +0900, Masahiro Yamada wrote:

> Commit 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
> accidentally inverted the logic of CONFIG_ARMV8_MULTIENTRY.
> 
> Fixes: 116611937faa ("ARM: fix ifdefs in ARMv8 lowlevel_init()")
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> Reviewed-by: Stephen Warren <swarren@nvidia.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S
index c3cc819..e933021 100644
--- a/arch/arm/cpu/armv8/start.S
+++ b/arch/arm/cpu/armv8/start.S
@@ -216,7 +216,7 @@  WEAK(lowlevel_init)
 #endif
 #endif
 
-#ifndef CONFIG_ARMV8_MULTIENTRY
+#ifdef CONFIG_ARMV8_MULTIENTRY
 	branch_if_master x0, x1, 2f
 
 	/*