[U-Boot] [RFC 01/22] arm: introduce ARCH_THUNDERX

[Alexander Graf]

On 22.02.19 19:02, Tim Harvey wrote:
> Signed-off-by: Tim Harvey <tharvey at gateworks.com>
> ---
>  arch/arm/Kconfig                                  |  6 +++---
>  arch/arm/Makefile                                 |  1 +
>  arch/arm/dts/Makefile                             |  2 +-
>  .../arm/include/asm/arch-thunderx}/atf.h          |  2 +-
>  .../arm/include/asm/arch-thunderx}/atf_part.h     |  0
>  .../arm/include/asm/arch-thunderx}/thunderx_svc.h |  0
>  arch/arm/include/asm/gpio.h                       |  2 +-
>  arch/arm/mach-thunderx/Makefile                   |  2 ++
>  .../thunderx => arch/arm/mach-thunderx}/atf.c     |  6 +++---
>  board/cavium/thunderx/Kconfig                     | 15 ++++++++++++---
>  board/cavium/thunderx/Makefile                    |  2 +-
>  board/cavium/thunderx/thunderx.c                  |  2 +-
>  configs/thunderx_88xx_defconfig                   |  3 ++-
>  13 files changed, 28 insertions(+), 15 deletions(-)
>  rename {include/cavium => arch/arm/include/asm/arch-thunderx}/atf.h (96%)
>  rename {include/cavium => arch/arm/include/asm/arch-thunderx}/atf_part.h (100%)
>  rename {include/cavium => arch/arm/include/asm/arch-thunderx}/thunderx_svc.h (100%)
>  create mode 100644 arch/arm/mach-thunderx/Makefile
>  rename {board/cavium/thunderx => arch/arm/mach-thunderx}/atf.c (98%)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 1f3fa1575a..9f6f5a41da 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -393,7 +393,7 @@ config SPL_USE_ARCH_MEMSET
>  
>  config ARM64_SUPPORT_AARCH32
>  	bool "ARM64 system support AArch32 execution state"
> -	default y if ARM64 && !TARGET_THUNDERX_88XX
> +	default y if ARM64 && !ARCH_THUNDERX
>  	help
>  	  This ARM64 system supports AArch32 execution state.
>  
> @@ -1359,8 +1359,8 @@ config ARCH_ROCKCHIP
>  	imply TPL_SYSRESET
>  	imply USB_FUNCTION_FASTBOOT
>  
> -config TARGET_THUNDERX_88XX
> -	bool "Support ThunderX 88xx"
> +config ARCH_THUNDERX
> +	bool "Support ThunderX"
>  	select ARM64
>  	select OF_CONTROL
>  	select PL01X_SERIAL
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 4b6c5e1935..f58e2cd29c 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -79,6 +79,7 @@ machine-$(CONFIG_STM32)			+= stm32
>  machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
>  machine-$(CONFIG_TEGRA)			+= tegra
>  machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
> +machine-$(CONFIG_ARCH_THUNDERX)		+= thunderx
>  machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
>  machine-$(CONFIG_ARCH_VERSAL)		+= versal
>  machine-$(CONFIG_ARCH_ZYNQMP_R5)	+= zynqmp-r5
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index d36447d18d..87ccd96596 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -192,7 +192,7 @@ dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb	\
>  	am437x-idk-evm.dtb \
>  	am4372-generic.dtb
>  dtb-$(CONFIG_TI816X) += dm8168-evm.dtb
> -dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
> +dtb-$(CONFIG_THUNDERX_88XX) += thunderx-88xx.dtb
>  
>  dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
>  	socfpga_arria5_socdk.dtb			\
> diff --git a/include/cavium/atf.h b/arch/arm/include/asm/arch-thunderx/atf.h
> similarity index 96%
> rename from include/cavium/atf.h
> rename to arch/arm/include/asm/arch-thunderx/atf.h
> index 3cf05c43d7..cda42d6140 100644
> --- a/include/cavium/atf.h
> +++ b/arch/arm/include/asm/arch-thunderx/atf.h
> @@ -4,7 +4,7 @@
>  **/
>  #ifndef __ATF_H__
>  #define __ATF_H__
> -#include <cavium/atf_part.h>
> +#include "atf_part.h"
>  
>  ssize_t atf_read_mmc(uintptr_t offset, void *buffer, size_t size);
>  ssize_t atf_read_nor(uintptr_t offset, void *buffer, size_t size);
> diff --git a/include/cavium/atf_part.h b/arch/arm/include/asm/arch-thunderx/atf_part.h
> similarity index 100%
> rename from include/cavium/atf_part.h
> rename to arch/arm/include/asm/arch-thunderx/atf_part.h
> diff --git a/include/cavium/thunderx_svc.h b/arch/arm/include/asm/arch-thunderx/thunderx_svc.h
> similarity index 100%
> rename from include/cavium/thunderx_svc.h
> rename to arch/arm/include/asm/arch-thunderx/thunderx_svc.h
> diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
> index 3039e66bf9..420f253c1b 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_THUNDERX)

This seems to be an unrelated change?


Alex