Explorar o código

arm64: zynqmp: Move SoC sources to mach-zynqmp

Similar changes was done for Zynq in past and this patch just follow
this pattern to separate cpu code from SoC code.

Move arch/arm/cpu/armv8/zynqmp/* -> arch/arm/mach-zynqmp/*
And also fix references to these files.

Based on
"ARM: zynq: move SoC sources to mach-zynq"
(sha1: 0107f2403669f764ab726d0d404e35bb9447bbcc)

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Michal Simek %!s(int64=5) %!d(string=hai) anos
pai
achega
274ccb5b11

+ 1 - 1
MAINTAINERS

@@ -362,7 +362,7 @@ ARM ZYNQMP
 M:	Michal Simek <michal.simek@xilinx.com>
 S:	Maintained
 T:	git git://git.denx.de/u-boot-microblaze.git
-F:	arch/arm/cpu/armv8/zynqmp/
+F:	arch/arm/mach-zynqmp/
 F:	drivers/clk/clk_zynqmp.c
 F:	drivers/fpga/zynqpl.c
 F:	drivers/gpio/zynq_gpio.c

+ 2 - 2
arch/arm/Kconfig

@@ -1503,14 +1503,14 @@ source "arch/arm/cpu/armv7/vf610/Kconfig"
 
 source "arch/arm/mach-zynq/Kconfig"
 
+source "arch/arm/mach-zynqmp/Kconfig"
+
 source "arch/arm/mach-versal/Kconfig"
 
 source "arch/arm/mach-zynqmp-r5/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
 
-source "arch/arm/cpu/armv8/zynqmp/Kconfig"
-
 source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"

+ 1 - 0
arch/arm/Makefile

@@ -81,6 +81,7 @@ machine-$(CONFIG_ARCH_STM32MP)		+= stm32mp
 machine-$(CONFIG_TEGRA)			+= tegra
 machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier
 machine-$(CONFIG_ARCH_ZYNQ)		+= zynq
+machine-$(CONFIG_ARCH_ZYNQMP)		+= zynqmp
 machine-$(CONFIG_ARCH_VERSAL)		+= versal
 machine-$(CONFIG_ARCH_ZYNQMP_R5)	+= zynqmp-r5
 

+ 0 - 1
arch/arm/cpu/armv8/Makefile

@@ -29,7 +29,6 @@ obj-$(CONFIG_$(SPL_)ARMV8_SEC_FIRMWARE_SUPPORT) += sec_firmware.o sec_firmware_a
 
 obj-$(CONFIG_FSL_LAYERSCAPE) += fsl-layerscape/
 obj-$(CONFIG_S32V234) += s32v234/
-obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/
 obj-$(CONFIG_TARGET_HIKEY) += hisilicon/
 obj-$(CONFIG_ARMV8_PSCI) += psci.o
 obj-$(CONFIG_ARCH_SUNXI) += lowlevel_init.o

+ 1 - 1
arch/arm/mach-k3/arm64-mmu.c

@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
  *	Lokesh Vutla <lokeshvutla@ti.com>
- * (This file is derived from arch/arm/cpu/armv8/zynqmp/cpu.c)
+ * (This file is derived from arch/arm/mach-zynqmp/cpu.c)
  *
  */
 

+ 1 - 1
arch/arm/mach-tegra/arm64-mmu.c

@@ -2,7 +2,7 @@
 /*
  * (C) Copyright 2014 - 2015 Xilinx, Inc.
  * Michal Simek <michal.simek@xilinx.com>
- * (This file derived from arch/arm/cpu/armv8/zynqmp/cpu.c)
+ * (This file derived from arch/arm/mach-zynqmp/cpu.c)
  *
  * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
  */

+ 0 - 0
arch/arm/cpu/armv8/zynqmp/Kconfig → arch/arm/mach-zynqmp/Kconfig


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/Makefile → arch/arm/mach-zynqmp/Makefile


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/clk.c → arch/arm/mach-zynqmp/clk.c


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/cpu.c → arch/arm/mach-zynqmp/cpu.c


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/handoff.c → arch/arm/mach-zynqmp/handoff.c


+ 0 - 0
arch/arm/include/asm/arch-zynqmp/clk.h → arch/arm/mach-zynqmp/include/mach/clk.h


+ 0 - 0
arch/arm/include/asm/arch-zynqmp/gpio.h → arch/arm/mach-zynqmp/include/mach/gpio.h


+ 0 - 0
arch/arm/include/asm/arch-zynqmp/hardware.h → arch/arm/mach-zynqmp/include/mach/hardware.h


+ 0 - 0
arch/arm/include/asm/arch-zynqmp/psu_init_gpl.h → arch/arm/mach-zynqmp/include/mach/psu_init_gpl.h


+ 0 - 0
arch/arm/include/asm/arch-zynqmp/sys_proto.h → arch/arm/mach-zynqmp/include/mach/sys_proto.h


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/mp.c → arch/arm/mach-zynqmp/mp.c


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/psu_spl_init.c → arch/arm/mach-zynqmp/psu_spl_init.c


+ 0 - 0
arch/arm/cpu/armv8/zynqmp/spl.c → arch/arm/mach-zynqmp/spl.c