[PATCH 1/2] powerpc/8xx: move CPM1 related files from sysdev/ to platforms/8xx

[Christophe Leroy]

Oops, I resent v1 together with v2. Sorry for the noise.

Le 13/06/2019 à 11:11, Christophe Leroy a écrit :
> Only 8xx selects CPM1 and related CONFIG options are already
> in platforms/8xx/Kconfig
> 
> This patch moves the related C files to platforms/8xx/.
> 
> Signed-off-by: Christophe Leroy <christophe.leroy at c-s.fr>
> ---
>   arch/powerpc/platforms/8xx/Makefile                 | 3 +++
>   arch/powerpc/{sysdev => platforms/8xx}/cpm1.c       | 0
>   arch/powerpc/{sysdev => platforms/8xx}/cpm_gpio.c   | 0
>   arch/powerpc/{sysdev => platforms/8xx}/micropatch.c | 0
>   arch/powerpc/sysdev/Makefile                        | 3 ---
>   5 files changed, 3 insertions(+), 3 deletions(-)
>   rename arch/powerpc/{sysdev => platforms/8xx}/cpm1.c (100%)
>   rename arch/powerpc/{sysdev => platforms/8xx}/cpm_gpio.c (100%)
>   rename arch/powerpc/{sysdev => platforms/8xx}/micropatch.c (100%)
> 
> diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
> index 708ab099e886..10b338436655 100644
> --- a/arch/powerpc/platforms/8xx/Makefile
> +++ b/arch/powerpc/platforms/8xx/Makefile
> @@ -3,6 +3,9 @@
>   # Makefile for the PowerPC 8xx linux kernel.
>   #
>   obj-y			+= m8xx_setup.o machine_check.o pic.o
> +obj-$(CONFIG_CPM1)		+= cpm1.o
> +obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o
> +obj-$(CONFIG_8xx_GPIO)		+= cpm_gpio.o
>   obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
>   obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
>   obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
> diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/platforms/8xx/cpm1.c
> similarity index 100%
> rename from arch/powerpc/sysdev/cpm1.c
> rename to arch/powerpc/platforms/8xx/cpm1.c
> diff --git a/arch/powerpc/sysdev/cpm_gpio.c b/arch/powerpc/platforms/8xx/cpm_gpio.c
> similarity index 100%
> rename from arch/powerpc/sysdev/cpm_gpio.c
> rename to arch/powerpc/platforms/8xx/cpm_gpio.c
> diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/platforms/8xx/micropatch.c
> similarity index 100%
> rename from arch/powerpc/sysdev/micropatch.c
> rename to arch/powerpc/platforms/8xx/micropatch.c
> diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
> index aaf23283ba0c..cfcade8270a9 100644
> --- a/arch/powerpc/sysdev/Makefile
> +++ b/arch/powerpc/sysdev/Makefile
> @@ -37,12 +37,9 @@ obj-$(CONFIG_XILINX_PCI)	+= xilinx_pci.o
>   obj-$(CONFIG_OF_RTC)		+= of_rtc.o
>   
>   obj-$(CONFIG_CPM)		+= cpm_common.o
> -obj-$(CONFIG_CPM1)		+= cpm1.o
>   obj-$(CONFIG_CPM2)		+= cpm2.o cpm2_pic.o cpm_gpio.o
> -obj-$(CONFIG_8xx_GPIO)		+= cpm_gpio.o
>   obj-$(CONFIG_QUICC_ENGINE)	+= cpm_common.o
>   obj-$(CONFIG_PPC_DCR)		+= dcr.o
> -obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o
>   
>   obj-$(CONFIG_PPC_MPC512x)	+= mpc5xxx_clocks.o
>   obj-$(CONFIG_PPC_MPC52xx)	+= mpc5xxx_clocks.o
>