From dc23c27aa5ac7672bc8206e0f46e9aceab1f0bb7 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Mon, 6 May 2019 11:21:13 +0800 Subject: 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 --- arch/arm/cpu/armv8/start.S | 4 ---- arch/arm/lib/vectors.S | 4 ---- 2 files changed, 8 deletions(-) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index ecee9e37a50..fe52166e28f 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 -#else #include -#endif #else b reset #endif diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 20f485142ef..56f36815582 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 -#else #include -#endif #else /* -- cgit v1.2.3