[U-Boot] arm: s5pc1xx: move sources to mach-s5pc1xx

[Minkyu Kang]

On 20/11/15 18:14, Minkyu Kang wrote:
> move arm/arm/cpu/armv7/s5pc1xx to arch/arm/mach-s5pc1xx
> 
> Signed-off-by: Minkyu Kang <mk7.kang at samsung.com>
> ---
>  MAINTAINERS                                                         | 6 ++----
>  arch/arm/Kconfig                                                    | 2 +-
>  arch/arm/Makefile                                                   | 1 +
>  arch/arm/cpu/armv7/Makefile                                         | 1 -
>  arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig                | 0
>  arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile               | 0
>  arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c                | 0
>  arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c                | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h   | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h   | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h  | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h   | 0
>  .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h         | 0
>  .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h         | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h   | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h | 0
>  .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h      | 0
>  .../{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h  | 0
>  .../asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h       | 0
>  arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S                | 0
>  22 files changed, 4 insertions(+), 6 deletions(-)
>  rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Kconfig (100%)
>  rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/Makefile (100%)
>  rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/cache.c (100%)
>  rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/clock.c (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clk.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/clock.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/cpu.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/gpio.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/mmc.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/periph.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pinmux.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/power.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/pwm.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sromc.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/sys_proto.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/uart.h (100%)
>  rename arch/arm/{include/asm/arch-s5pc1xx => mach-s5pc1xx/include/mach}/watchdog.h (100%)
>  rename arch/arm/{cpu/armv7/s5pc1xx => mach-s5pc1xx}/reset.S (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b3a45cc..394be1e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -112,12 +112,10 @@ M:	Minkyu Kang <mk7.kang at samsung.com>
>  S:	Maintained
>  T:	git git://git.denx.de/u-boot-samsung.git
>  F:	arch/arm/cpu/arm920t/s3c24x0/
> -F:	arch/arm/cpu/armv7/exynos/
> -F:	arch/arm/cpu/armv7/s5pc1xx/
> +F:	arch/arm/mach-exynos/
> +F:	arch/arm/mach-s5pc1xx/
>  F:	arch/arm/cpu/armv7/s5p-common/
> -F:	arch/arm/include/asm/arch-exynos/
>  F:	arch/arm/include/asm/arch-s3c24x0/
> -F:	arch/arm/include/asm/arch-s5pc1xx/
>  
>  ARM STM SPEAR
>  M:	Vipin Kumar <vipin.kumar at st.com>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 5ab0254..7fb8697 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -720,7 +720,7 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
>  
>  source "arch/arm/mach-rockchip/Kconfig"
>  
> -source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
> +source "arch/arm/mach-s5pc1xx/Kconfig"
>  
>  source "arch/arm/mach-socfpga/Kconfig"
>  
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 58f9bbb..18283d1 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -53,6 +53,7 @@ machine-$(CONFIG_ARMADA_XP)		+= mvebu
>  # TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
>  # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
>  machine-$(CONFIG_ORION5X)		+= orion5x
> +machine-$(CONFIG_ARCH_S5PC1XX)		+= s5pc1xx
>  machine-$(CONFIG_ARCH_SOCFPGA)		+= socfpga
>  machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip
>  machine-$(CONFIG_TEGRA)			+= tegra
> diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
> index c8d1422..45f346c 100644
> --- a/arch/arm/cpu/armv7/Makefile
> +++ b/arch/arm/cpu/armv7/Makefile
> @@ -49,7 +49,6 @@ obj-$(CONFIG_OMAP34XX) += omap3/
>  obj-$(CONFIG_OMAP44XX) += omap4/
>  obj-$(CONFIG_OMAP54XX) += omap5/
>  obj-$(CONFIG_RMOBILE) += rmobile/
> -obj-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx/
>  obj-$(if $(filter stv0991,$(SOC)),y) += stv0991/
>  obj-$(CONFIG_ARCH_SUNXI) += sunxi/
>  obj-$(CONFIG_VF610) += vf610/
> diff --git a/arch/arm/cpu/armv7/s5pc1xx/Kconfig b/arch/arm/mach-s5pc1xx/Kconfig
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc1xx/Kconfig
> rename to arch/arm/mach-s5pc1xx/Kconfig
> diff --git a/arch/arm/cpu/armv7/s5pc1xx/Makefile b/arch/arm/mach-s5pc1xx/Makefile
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc1xx/Makefile
> rename to arch/arm/mach-s5pc1xx/Makefile
> diff --git a/arch/arm/cpu/armv7/s5pc1xx/cache.c b/arch/arm/mach-s5pc1xx/cache.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc1xx/cache.c
> rename to arch/arm/mach-s5pc1xx/cache.c
> diff --git a/arch/arm/cpu/armv7/s5pc1xx/clock.c b/arch/arm/mach-s5pc1xx/clock.c
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc1xx/clock.c
> rename to arch/arm/mach-s5pc1xx/clock.c
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/clk.h b/arch/arm/mach-s5pc1xx/include/mach/clk.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/clk.h
> rename to arch/arm/mach-s5pc1xx/include/mach/clk.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/clock.h b/arch/arm/mach-s5pc1xx/include/mach/clock.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/clock.h
> rename to arch/arm/mach-s5pc1xx/include/mach/clock.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h b/arch/arm/mach-s5pc1xx/include/mach/cpu.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/cpu.h
> rename to arch/arm/mach-s5pc1xx/include/mach/cpu.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/gpio.h b/arch/arm/mach-s5pc1xx/include/mach/gpio.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/gpio.h
> rename to arch/arm/mach-s5pc1xx/include/mach/gpio.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/mach-s5pc1xx/include/mach/mmc.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/mmc.h
> rename to arch/arm/mach-s5pc1xx/include/mach/mmc.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/periph.h b/arch/arm/mach-s5pc1xx/include/mach/periph.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/periph.h
> rename to arch/arm/mach-s5pc1xx/include/mach/periph.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/pinmux.h b/arch/arm/mach-s5pc1xx/include/mach/pinmux.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/pinmux.h
> rename to arch/arm/mach-s5pc1xx/include/mach/pinmux.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/power.h b/arch/arm/mach-s5pc1xx/include/mach/power.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/power.h
> rename to arch/arm/mach-s5pc1xx/include/mach/power.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/mach-s5pc1xx/include/mach/pwm.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/pwm.h
> rename to arch/arm/mach-s5pc1xx/include/mach/pwm.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/sromc.h
> rename to arch/arm/mach-s5pc1xx/include/mach/sromc.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/sys_proto.h b/arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/sys_proto.h
> rename to arch/arm/mach-s5pc1xx/include/mach/sys_proto.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/uart.h b/arch/arm/mach-s5pc1xx/include/mach/uart.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/uart.h
> rename to arch/arm/mach-s5pc1xx/include/mach/uart.h
> diff --git a/arch/arm/include/asm/arch-s5pc1xx/watchdog.h b/arch/arm/mach-s5pc1xx/include/mach/watchdog.h
> similarity index 100%
> rename from arch/arm/include/asm/arch-s5pc1xx/watchdog.h
> rename to arch/arm/mach-s5pc1xx/include/mach/watchdog.h
> diff --git a/arch/arm/cpu/armv7/s5pc1xx/reset.S b/arch/arm/mach-s5pc1xx/reset.S
> similarity index 100%
> rename from arch/arm/cpu/armv7/s5pc1xx/reset.S
> rename to arch/arm/mach-s5pc1xx/reset.S
> 

applied to u-boot-samsung.

Thanks,
Minkyu Kang.