ARM: kirkwood: move SOC sources to mach-kirkwood

Move
arch/arm/cpu/arm926ejs/kirkwood/* -> arch/arm/mach-kirkwood/*

Note:
 Perhaps, can we merge arch/arm/mach-kirkwood and
 arch/arm/mvebu-common into arch/arm/mach-mvebu, like Linux?

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Stefan Roese <sr@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Luka Perkov <luka.perkov@sartura.hr>
master
Masahiro Yamada 9 years ago committed by Tom Rini
parent 601fbec7cf
commit 56f86e39e8
  1. 2
      MAINTAINERS
  2. 2
      arch/arm/Kconfig
  3. 2
      arch/arm/Makefile
  4. 1
      arch/arm/cpu/arm926ejs/Makefile
  5. 0
      arch/arm/mach-kirkwood/Kconfig
  6. 0
      arch/arm/mach-kirkwood/Makefile
  7. 0
      arch/arm/mach-kirkwood/cache.c
  8. 0
      arch/arm/mach-kirkwood/cpu.c
  9. 0
      arch/arm/mach-kirkwood/mpp.c

@ -99,7 +99,7 @@ M: Prafulla Wadaskar <prafulla@marvell.com>
M: Luka Perkov <luka.perkov@sartura.hr>
S: Maintained
T: git git://git.denx.de/u-boot-marvell.git
F: arch/arm/cpu/arm926ejs/kirkwood/
F: arch/arm/mach-kirkwood/
F: arch/arm/include/asm/arch-kirkwood/
ARM MARVELL PXA

@ -726,7 +726,7 @@ source "arch/arm/cpu/armv7/highbank/Kconfig"
source "arch/arm/cpu/armv7/keystone/Kconfig"
source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
source "arch/arm/mach-kirkwood/Kconfig"
source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"

@ -6,6 +6,8 @@
# by CONFIG_* macro name.
machine-$(CONFIG_ARCH_AT91) += at91
machine-$(CONFIG_ARCH_DAVINCI) += davinci
# TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
machine-$(CONFIG_KIRKWOOD) += kirkwood
# TODO: rename CONFIG_TEGRA -> CONFIG_ARCH_TEGRA
machine-$(CONFIG_TEGRA) += tegra

@ -15,7 +15,6 @@ endif
endif
obj-$(CONFIG_ARMADA100) += armada100/
obj-$(CONFIG_KIRKWOOD) += kirkwood/
obj-$(if $(filter lpc32xx,$(SOC)),y) += lpc32xx/
obj-$(CONFIG_MB86R0x) += mb86r0x/
obj-$(CONFIG_MX25) += mx25/

Loading…
Cancel
Save