| commit | d0787656405fc9a43f00715a0d05c2860cbe7b81 | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Sat Apr 25 06:29:46 2015 +0200 |
| committer | Luka Perkov <luka.perkov@sartura.hr> | Tue May 05 14:28:29 2015 +0200 |
| tree | 74b29290b0a12ad313aff70036054cac158d092c | |
| parent | 8cb78722306351c5d61ce4da18c284ef59c0caef [diff] |
arm: mvebu: Move mvebu-common into mach-mvebu Now that the mach-mvebu directory exists and is used by Armada XP we can move the mvebu-common files into this directory as well. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Kevin Smith <kevin.smith@elecsyscorp.com> Tested-by: Dirk Eibach <dirk.eibach@gdsys.cc>
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 63ed321..8ff94a3 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -86,8 +86,8 @@ endif endif -ifneq (,$(filter $(SOC), mvebu kirkwood)) -libs-y += arch/arm/mvebu-common/ +ifneq (,$(filter $(SOC), kirkwood)) +libs-y += arch/arm/mach-mvebu/ endif # deprecated
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 737159b..4f477cd 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile
@@ -1,9 +1,24 @@ # -# Copyright (C) 2014 Stefan Roese <sr@denx.de> +# Copyright (C) 2014-2015 Stefan Roese <sr@denx.de> # # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_KIRKWOOD + +obj-y = dram.o +obj-y += gpio.o +obj-y += timer.o + +else + obj-y = cpu.o +obj-y += dram.o +obj-y += gpio.o +obj-y += mbus.o +obj-y += timer.o obj-$(CONFIG_SPL_BUILD) += spl.o obj-$(CONFIG_SPL_BUILD) += lowlevel_spl.o + +obj-y += serdes/ +endif
diff --git a/arch/arm/mvebu-common/dram.c b/arch/arm/mach-mvebu/dram.c similarity index 100% rename from arch/arm/mvebu-common/dram.c rename to arch/arm/mach-mvebu/dram.c
diff --git a/arch/arm/mvebu-common/gpio.c b/arch/arm/mach-mvebu/gpio.c similarity index 100% rename from arch/arm/mvebu-common/gpio.c rename to arch/arm/mach-mvebu/gpio.c
diff --git a/arch/arm/mvebu-common/mbus.c b/arch/arm/mach-mvebu/mbus.c similarity index 100% rename from arch/arm/mvebu-common/mbus.c rename to arch/arm/mach-mvebu/mbus.c
diff --git a/arch/arm/mvebu-common/serdes/Makefile b/arch/arm/mach-mvebu/serdes/Makefile similarity index 100% rename from arch/arm/mvebu-common/serdes/Makefile rename to arch/arm/mach-mvebu/serdes/Makefile
diff --git a/arch/arm/mvebu-common/serdes/board_env_spec.h b/arch/arm/mach-mvebu/serdes/board_env_spec.h similarity index 100% rename from arch/arm/mvebu-common/serdes/board_env_spec.h rename to arch/arm/mach-mvebu/serdes/board_env_spec.h
diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/high_speed_env_lib.c similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_lib.c rename to arch/arm/mach-mvebu/serdes/high_speed_env_lib.c
diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/high_speed_env_spec.c similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_spec.c rename to arch/arm/mach-mvebu/serdes/high_speed_env_spec.c
diff --git a/arch/arm/mvebu-common/serdes/high_speed_env_spec.h b/arch/arm/mach-mvebu/serdes/high_speed_env_spec.h similarity index 100% rename from arch/arm/mvebu-common/serdes/high_speed_env_spec.h rename to arch/arm/mach-mvebu/serdes/high_speed_env_spec.h
diff --git a/arch/arm/mvebu-common/timer.c b/arch/arm/mach-mvebu/timer.c similarity index 100% rename from arch/arm/mvebu-common/timer.c rename to arch/arm/mach-mvebu/timer.c
diff --git a/arch/arm/mvebu-common/u-boot-spl.lds b/arch/arm/mach-mvebu/u-boot-spl.lds similarity index 100% rename from arch/arm/mvebu-common/u-boot-spl.lds rename to arch/arm/mach-mvebu/u-boot-spl.lds