summaryrefslogtreecommitdiff
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
parent44f75eb5b6bf1107bec43601972d7a12709f10d5 (diff)
Quartz: Update Quartz machine Type and ID.3.0-quartz-ts1.1
-rw-r--r--arch/arm/configs/quartz_defconfig5
-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
-rw-r--r--arch/arm/tools/mach-types3
5 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/configs/quartz_defconfig b/arch/arm/configs/quartz_defconfig
index f7faa04..df94a55 100644
--- a/arch/arm/configs/quartz_defconfig
+++ b/arch/arm/configs/quartz_defconfig
@@ -293,7 +293,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_ARCH_MVFA5=y
CONFIG_SOC_MVFA5=y
# CONFIG_MACH_MVFA5_TWR_VF700 is not set
-CONFIG_MACH_QDK=y
+CONFIG_MACH_DS_QUARTZ=y
CONFIG_ISP1504_MXC=y
# CONFIG_MXC_IRQ_PRIOR is not set
# CONFIG_MXC_PWM is not set
@@ -2184,9 +2184,6 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
-# CONFIG_BRANCH_PROFILE_NONE is not set
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
diff --git a/arch/arm/mach-mvf/Kconfig b/arch/arm/mach-mvf/Kconfig
index b76f665..f2f62a1d 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 b0c87fb..e793572 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 dde924e..e146616 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,
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 1de4dfa..18b0a21 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -1121,4 +1121,5 @@ mvf_twr_vf400 MACH_MVFA5_TWR_VF400 MVFA5_TWR_VF400 4148
mvf_twr_vf500 MACH_MVFA5_TWR_VF500 MVFA5_TWR_VF500 4147
mvf_twr_vf600 MACH_MVFA5_TWR_VF600 MVFA5_TWR_VF600 4146
mvf_twr_vf700 MACH_MVFA5_TWR_VF700 MVFA5_TWR_VF700 2125
-mvf_twr_vf700 MACH_QDK MVFA5_TWR_VF700 2125
+ds_quartz MACH_DS_QUARTZ DS_QUARTZ 4837
+ \ No newline at end of file