diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Makefile | 4 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/Makefile | 17 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/dram.c (renamed from arch/arm/mvebu-common/dram.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/gpio.c (renamed from arch/arm/mvebu-common/gpio.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/mbus.c (renamed from arch/arm/mvebu-common/mbus.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/Makefile (renamed from arch/arm/mvebu-common/serdes/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/board_env_spec.h (renamed from arch/arm/mvebu-common/serdes/board_env_spec.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/high_speed_env_lib.c (renamed from arch/arm/mvebu-common/serdes/high_speed_env_lib.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/high_speed_env_spec.c (renamed from arch/arm/mvebu-common/serdes/high_speed_env_spec.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/serdes/high_speed_env_spec.h (renamed from arch/arm/mvebu-common/serdes/high_speed_env_spec.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/timer.c (renamed from arch/arm/mvebu-common/timer.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/u-boot-spl.lds (renamed from arch/arm/mvebu-common/u-boot-spl.lds) | 0 |
12 files changed, 18 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 63ed3214f65..8ff94a3c0b4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -86,8 +86,8 @@ libs-y += arch/arm/imx-common/ 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 737159ba12a..4f477cded86 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 index db18791a862..db18791a862 100644 --- a/arch/arm/mvebu-common/dram.c +++ b/arch/arm/mach-mvebu/dram.c diff --git a/arch/arm/mvebu-common/gpio.c b/arch/arm/mach-mvebu/gpio.c index 56e54e0a621..56e54e0a621 100644 --- a/arch/arm/mvebu-common/gpio.c +++ b/arch/arm/mach-mvebu/gpio.c diff --git a/arch/arm/mvebu-common/mbus.c b/arch/arm/mach-mvebu/mbus.c index 05c9ef2cbbc..05c9ef2cbbc 100644 --- a/arch/arm/mvebu-common/mbus.c +++ b/arch/arm/mach-mvebu/mbus.c diff --git a/arch/arm/mvebu-common/serdes/Makefile b/arch/arm/mach-mvebu/serdes/Makefile index a380fee1445..a380fee1445 100644 --- a/arch/arm/mvebu-common/serdes/Makefile +++ b/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 index 36e0ed80f0d..36e0ed80f0d 100644 --- a/arch/arm/mvebu-common/serdes/board_env_spec.h +++ b/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 index 702273aee12..702273aee12 100644 --- a/arch/arm/mvebu-common/serdes/high_speed_env_lib.c +++ b/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 index 115ec2cd600..115ec2cd600 100644 --- a/arch/arm/mvebu-common/serdes/high_speed_env_spec.c +++ b/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 index e5aa1b06edb..e5aa1b06edb 100644 --- a/arch/arm/mvebu-common/serdes/high_speed_env_spec.h +++ b/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 index 40c4bc2da1b..40c4bc2da1b 100644 --- a/arch/arm/mvebu-common/timer.c +++ b/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 index eee1db49eed..eee1db49eed 100644 --- a/arch/arm/mvebu-common/u-boot-spl.lds +++ b/arch/arm/mach-mvebu/u-boot-spl.lds |