Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272971
b: refs/heads/master
c: 9fbbe68
h: refs/heads/master
i:
  272969: e0c3ac9
  272967: 8a1d6e0
v: v3
  • Loading branch information
Shawn Guo authored and Arnd Bergmann committed Oct 31, 2011
1 parent 2d530b0 commit c7be600
Show file tree
Hide file tree
Showing 7 changed files with 2,264 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1103643c266ae45c7098e0f7f3ee0b68e3e7c7cc
refs/heads/master: 9fbbe6890c88aa332efe61d5894108dd8b932530
13 changes: 13 additions & 0 deletions trunk/arch/arm/mach-imx/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
config IMX_HAVE_DMA_V1
bool

config HAVE_IMX_GPC
bool

config HAVE_IMX_MMDC
bool

config HAVE_IMX_SRC
bool

#
# ARCH_MX31 and ARCH_MX35 are left for compatibility
# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
Expand Down Expand Up @@ -601,6 +611,9 @@ config SOC_IMX6Q
select ARM_GIC
select CACHE_L2X0
select CPU_V7
select HAVE_IMX_GPC
select HAVE_IMX_MMDC
select HAVE_IMX_SRC
select USE_OF

help
Expand Down
4 changes: 4 additions & 0 deletions trunk/arch/arm/mach-imx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o

obj-$(CONFIG_DEBUG_LL) += lluart.o
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o
Loading

0 comments on commit c7be600

Please sign in to comment.