diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-08 14:24:07 +0200 |
|---|---|---|
| committer | Philippe LANGLAIS <philippe.langlais@stericsson.com> | 2011-06-09 08:58:09 +0200 |
| commit | 302ece89aabff7dd8a0f4db6ab9d1a5bde9ece17 (patch) | |
| tree | 3fc80d669fa482de7cdddea215299997fc445bce | |
| parent | cb6e566498419cf64890097986662dfc2f012dc9 (diff) | |
ux500: Change makefile to support ux500 soc
Change the Makefile and Kconfig to support
both db8500 and db5500 -soc in the same build.
ST-Ericsson Linux next: OK
ST-Ericsson ID: 342253
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: Iad191d021a1df362e232a696347a99c7c47ff574
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24726
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/Makefile | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 6a986e7e23a..00b3ae6998a 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -8,14 +8,19 @@ config UX500_SOC_COMMON select ARM_ERRATA_753970 select SYS_SOC +config UX500_SOC_DBX500 + depends on UX500_SOC_DB5500 || UX500_SOC_DB8500 + bool + menu "Ux500 SoC" config UX500_SOC_DB5500 bool "DB5500" + select UX500_SOC_DBX500 config UX500_SOC_DB8500 bool "DB8500" - select REGULATOR + select UX500_SOC_DBX500 endmenu diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index e76ac44a440..b3683935b24 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -6,12 +6,16 @@ obj-y := clock.o cpu.o devices.o dcache.o \ devices-common.o id.o pins.o \ timer.o timer-mtu.o usb.o reboot_reasons.o obj-y += pm/ -obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o prcmu-db5500.o \ +ifeq ($(CONFIG_UX500_SOC_DB5500), y) +obj-$(CONFIG_UX500_SOC_DBX500) += cpu-db5500.o dma-db5500.o prcmu-db5500.o \ devices-db5500.o clock-db5500.o \ clock-debug.o -obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o \ +endif +ifeq ($(CONFIG_UX500_SOC_DB8500), y) +obj-$(CONFIG_UX500_SOC_DBX500) += cpu-db8500.o devices-db8500.o \ prcmu-db8500.o clock-db8500.o \ timer-rtt.o +endif obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-uib.o board-mop500-stuib.o \ |