diff options
| author | Kever Yang <kever.yang@rock-chips.com> | 2019-05-06 11:21:13 +0800 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2019-05-08 17:34:12 +0800 |
| commit | dc23c27aa5ac7672bc8206e0f46e9aceab1f0bb7 (patch) | |
| tree | 3b94b3be3c3ad26ebdb52e9fbf48cb3a65e7a943 /arch/arm | |
| parent | 93557bd260506c9965ad592d05b610268ab59a3f (diff) | |
arm: remove ARCH_ROCKCHIP macro in common code
This is fix to:
e2a12f590d rockchip: use 'arch-rockchip' as header file path
The V2 of origin patch set has fix this, but we merge V1 by
mistake, so lets correct it.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv8/start.S | 4 | ||||
| -rw-r--r-- | arch/arm/lib/vectors.S | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index ecee9e37a5..fe52166e28 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -26,11 +26,7 @@ _start: * order to boot, allow them to set that in their boot0.h file and then * use it here. */ -#ifdef CONFIG_ARCH_ROCKCHIP -#include <asm/arch-rockchip/boot0.h> -#else #include <asm/arch/boot0.h> -#endif #else b reset #endif diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 20f485142e..56f3681558 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -67,11 +67,7 @@ * (1) defines '_start:' as appropriate * (2) inserts the vector table using ARM_VECTORS as appropriate */ -#ifdef CONFIG_ARCH_ROCKCHIP -#include <asm/arch-rockchip/boot0.h> -#else #include <asm/arch/boot0.h> -#endif #else /* |