On Mon, Apr 01, 2019 at 09:12:07AM +0200, Neil Armstrong wrote:
On 28/03/2019 04:01, Kever Yang wrote:
rockchip platform header file is in 'arch-rockchip' instead of arch-$(SOC) for all SoCs.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
arch/arm/cpu/armv8/start.S | 4 ++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/lib/vectors.S | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index fe52166e28..ecee9e37a5 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -26,7 +26,11 @@ _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/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 3039e66bf9..b0c8c47c95 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,5 +1,5 @@ #if !defined(CONFIG_ARCH_UNIPHIER) && !defined(CONFIG_ARCH_STI) && \
- !defined(CONFIG_ARCH_K3)
- !defined(CONFIG_ARCH_K3) && !defined(CONFIG_ARCH_ROCKCHIP)
#include <asm/arch/gpio.h> #endif #include <asm-generic/gpio.h> diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S index 2ca6e2494a..20f485142e 100644 --- a/arch/arm/lib/vectors.S +++ b/arch/arm/lib/vectors.S @@ -67,8 +67,11 @@
- (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
/*
Hi,
All vendors has the same issue here, like Amlogic, but we use "meson" as $(SOC), if every vendor add its own specific include in common headers like this, this won't scale...
We should fix all this CONFIG_SOC instead of adding this, by maybe using the SYS_VENDOR for the arch include dir ?
We should either: - Grab the mechanism currently used in the kernel to allow for another high-level symlink to happen and re-org our files like this to allow for that - In these cases, at least for now have <asm/arch-$(SOC)/boot0.h> grab the appropriate <asm/subdir/boot0.h> like we do on other files, and do the first option later.