diff options
-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 \ |