summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mvf
diff options
context:
space:
mode:
authorRoshni Shah <roshni.shah@timesys.com>2014-01-09 22:16:58 -0500
committerRoshni Shah <roshni.shah@timesys.com>2014-01-09 22:16:58 -0500
commit29000e743e28a7174c54e81c3c45a58fe35e17ff (patch)
tree7359007991e40400f77d4cb25bb3cc09dcb33d77 /arch/arm/mach-mvf
parent44f75eb5b6bf1107bec43601972d7a12709f10d5 (diff)
Quartz: Update Quartz machine Type and ID.3.0-quartz-ts1.1
Diffstat (limited to 'arch/arm/mach-mvf')
-rw-r--r--arch/arm/mach-mvf/Kconfig2
-rw-r--r--arch/arm/mach-mvf/Makefile2
-rw-r--r--arch/arm/mach-mvf/board-quartz.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mvf/Kconfig b/arch/arm/mach-mvf/Kconfig
index b76f665c9409..f2f62a1d54c6 100644
--- a/arch/arm/mach-mvf/Kconfig
+++ b/arch/arm/mach-mvf/Kconfig
@@ -59,7 +59,7 @@ config MACH_MVFA5_TWR_VF700
Include support for MVF TWR-VF700 platform. This includes specific
configurations for the board and its peripherals.
-config MACH_QDK
+config MACH_DS_QUARTZ
bool "Support Device Solutions Quartz (MVF CORTEX-A5) platform"
select ARCH_MVFA5
select SOC_MVFA5
diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile
index b0c87fb1dab5..e79357240111 100644
--- a/arch/arm/mach-mvf/Makefile
+++ b/arch/arm/mach-mvf/Makefile
@@ -8,4 +8,4 @@ obj-y += l2switch.o
obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o
obj-$(CONFIG_MACH_MVFA5_TWR_VF700) += board-twr-vf700.o
-obj-$(CONFIG_MACH_QDK) += board-quartz.o
+obj-$(CONFIG_MACH_DS_QUARTZ) += board-quartz.o
diff --git a/arch/arm/mach-mvf/board-quartz.c b/arch/arm/mach-mvf/board-quartz.c
index dde924e28181..e146616e33c3 100644
--- a/arch/arm/mach-mvf/board-quartz.c
+++ b/arch/arm/mach-mvf/board-quartz.c
@@ -470,7 +470,7 @@ static struct sys_timer mxc_timer = {
/*
* initialize __mach_desc_ data structure.
*/
-MACHINE_START(MVFA5_TWR_VF700, "Device Solutions QDK Board")
+MACHINE_START(DS_QUARTZ, "Device Solutions QDK Board")
.boot_params = MVF_PHYS_OFFSET + 0x100,
.fixup = fixup_mxc_board,
.map_io = mvf_map_io,