diff options
| author | Stephen Warren <swarren@wwwdotorg.org> | 2016-04-01 21:14:14 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-04-11 12:44:38 -0400 |
| commit | 7439b4399b14242e6c41b86734baa3fe31c4517f (patch) | |
| tree | f8129b96b541a4fd7febb46dddfe79b641b3e723 /arch/arm/cpu/armv8 | |
| parent | 4861be7e68e6cf1359389837be174dbb40d07533 (diff) | |
| download | blackbird-obmc-uboot-7439b4399b14242e6c41b86734baa3fe31c4517f.tar.gz blackbird-obmc-uboot-7439b4399b14242e6c41b86734baa3fe31c4517f.zip | |
ARM: allow CONFIG_GICV* not to be defined
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>
Diffstat (limited to 'arch/arm/cpu/armv8')
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 67b166c7fd..dceedd7100 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 |
