diff mbox

[U-Boot,1/2] ARM: allow CONFIG_GICV* not to be defined

Message ID 1459566855-15100-1-git-send-email-swarren@wwwdotorg.org
State Accepted
Commit 7439b4399b14242e6c41b86734baa3fe31c4517f
Delegated to: Tom Rini
Headers show

Commit Message

Stephen Warren April 2, 2016, 3:14 a.m. UTC 
There are ARM SoCs (such as the BCM2837) do not contain an ARM GIC. Fix
the ARMv8 CPU startup code to compile in this case.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---
 arch/arm/cpu/armv8/start.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tom Rini April 2, 2016, 1:25 p.m. UTC | #1 
On Fri, Apr 01, 2016 at 09:14:14PM -0600, Stephen Warren wrote:

> There are ARM SoCs (such as the BCM2837) do not contain an ARM GIC. Fix
> the ARMv8 CPU startup code to compile in this case.
> 
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini April 12, 2016, 2:28 a.m. UTC | #2 
On Fri, Apr 01, 2016 at 09:14:14PM -0600, Stephen Warren wrote:

> There are ARM SoCs (such as the BCM2837) do not contain an ARM GIC. Fix
> the ARMv8 CPU startup code to compile in this case.
> 
> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
> Reviewed-by: Tom Rini <trini@konsulko.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 67b166c7fd46..dceedd7100ae 100644
--- a/arch/arm/cpu/armv8/start.S
+++ b/arch/arm/cpu/armv8/start.S
@@ -202,14 +202,14 @@  WEAK(lowlevel_init)
 	mov	x29, lr			/* Save LR */
 
 #ifndef CONFIG_ARMV8_MULTIENTRY
+#if defined(CONFIG_GICV2) || defined(CONFIG_GICV3)
 	/*
 	 * For single-entry systems the lowlevel init is very simple.
 	 */
 	ldr	x0, =GICD_BASE
 	bl	gic_init_secure
-
+#endif
 #else /* CONFIG_ARMV8_MULTIENTRY is set */
-
 #if defined(CONFIG_GICV2) || defined(CONFIG_GICV3)
 	branch_if_slave x0, 1f
 	ldr	x0, =GICD_BASE