From: Bin Meng <bmeng.cn@gmail.com>
Date: Thu, 16 Apr 2020 15:09:29 +0000 (-0700)
Subject: riscv: Merge unnecessary SMP ifdefs in start.S
X-Git-Tag: v2020.07-rc1~20^2~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84dc9d26908798c7e9ee5469965c16653593fde5;p=oweals%2Fu-boot.git

riscv: Merge unnecessary SMP ifdefs in start.S

Two consecutive SMP ifdefs blocks can be combined into one.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
---

diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S
index 6b3ff99c38..ecf0482635 100644
--- a/arch/riscv/cpu/start.S
+++ b/arch/riscv/cpu/start.S
@@ -58,9 +58,7 @@ _start:
 	/* tp: hart id */
 	li	t0, CONFIG_NR_CPUS
 	bge	tp, t0, hart_out_of_bounds_loop
-#endif
 
-#ifdef CONFIG_SMP
 	/* set xSIE bit to receive IPIs */
 #if CONFIG_IS_ENABLED(RISCV_MMODE)
 	li	t0, MIE_MSIE
@@ -377,9 +375,7 @@ hart_out_of_bounds_loop:
 	/* Harts in this loop are out of bounds, increase CONFIG_NR_CPUS. */
 	wfi
 	j	hart_out_of_bounds_loop
-#endif
 
-#ifdef CONFIG_SMP
 /* SMP relocation entry */
 secondary_hart_relocate:
 	/* a1: new sp */