[U-Boot] [PATCH v3 2/2] arm: remove ARCH_ROCKCHIP macro in common code
Kever Yang
kever.yang at rock-chips.com
Mon May 6 03:21:13 UTC 2019
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 at rock-chips.com>
---
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 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
/*
--
2.20.1
More information about the U-Boot
mailing list