mirror of
https://github.com/torvalds/linux.git
synced 2024-11-07 20:51:47 +00:00
eaed435a7b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS
BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj
2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs
BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3
Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc
BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA
H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY
2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC
9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG
x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY
sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV
CCen+xhdxX/dp83A/A0k
=ZgSs
-----END PGP SIGNATURE-----
Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.
* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM i.MX: Update defconfig
ARM i.MX: Merge i.MX5 support into mach-imx
ARM i.MX5: remove unnecessary includes from board files
Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}
Pull request had been sent to the wrong email address, but happened
before the merge window closed. I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
102 lines
2.3 KiB
Plaintext
102 lines
2.3 KiB
Plaintext
if ARCH_MXC
|
|
|
|
source "arch/arm/plat-mxc/devices/Kconfig"
|
|
|
|
menu "Freescale MXC Implementations"
|
|
|
|
choice
|
|
prompt "Freescale CPU family:"
|
|
default ARCH_IMX_V6_V7
|
|
|
|
config ARCH_IMX_V4_V5
|
|
bool "i.MX1, i.MX21, i.MX25, i.MX27"
|
|
select AUTO_ZRELADDR if !ZBOOT_ROM
|
|
select ARM_PATCH_PHYS_VIRT
|
|
help
|
|
This enables support for systems based on the Freescale i.MX ARMv4
|
|
and ARMv5 SoCs
|
|
|
|
config ARCH_IMX_V6_V7
|
|
bool "i.MX3, i.MX5, i.MX6"
|
|
select AUTO_ZRELADDR if !ZBOOT_ROM
|
|
select ARM_PATCH_PHYS_VIRT
|
|
select MIGHT_HAVE_CACHE_L2X0
|
|
help
|
|
This enables support for systems based on the Freescale i.MX3, i.MX5
|
|
and i.MX6 family.
|
|
|
|
endchoice
|
|
|
|
source "arch/arm/mach-imx/Kconfig"
|
|
|
|
endmenu
|
|
|
|
config MXC_IRQ_PRIOR
|
|
bool "Use IRQ priority"
|
|
help
|
|
Select this if you want to use prioritized IRQ handling.
|
|
This feature prevents higher priority ISR to be interrupted
|
|
by lower priority IRQ even IRQF_DISABLED flag is not set.
|
|
This may be useful in embedded applications, where are strong
|
|
requirements for timing.
|
|
Say N here, unless you have a specialized requirement.
|
|
|
|
config MXC_TZIC
|
|
bool
|
|
|
|
config MXC_AVIC
|
|
bool
|
|
|
|
config MXC_PWM
|
|
tristate "Enable PWM driver"
|
|
select HAVE_PWM
|
|
help
|
|
Enable support for the i.MX PWM controller(s).
|
|
|
|
config MXC_DEBUG_BOARD
|
|
bool "Enable MXC debug board(for 3-stack)"
|
|
help
|
|
The debug board is an integral part of the MXC 3-stack(PDK)
|
|
platforms, it can be attached or removed from the peripheral
|
|
board. On debug board, several debug devices(ethernet, UART,
|
|
buttons, LEDs and JTAG) are implemented. Between the MCU and
|
|
these devices, a CPLD is added as a bridge which performs
|
|
data/address de-multiplexing and decode, signal level shift,
|
|
interrupt control and various board functions.
|
|
|
|
config HAVE_EPIT
|
|
bool
|
|
|
|
config MXC_USE_EPIT
|
|
bool "Use EPIT instead of GPT"
|
|
depends on HAVE_EPIT
|
|
help
|
|
Use EPIT as the system timer on systems that have it. Normally you
|
|
don't have a reason to do so as the EPIT has the same features and
|
|
uses the same clocks as the GPT. Anyway, on some systems the GPT
|
|
may be in use for other purposes.
|
|
|
|
config MXC_ULPI
|
|
bool
|
|
|
|
config ARCH_HAS_RNGA
|
|
bool
|
|
|
|
config IMX_HAVE_IOMUX_V1
|
|
bool
|
|
|
|
config ARCH_MXC_IOMUX_V3
|
|
bool
|
|
|
|
config ARCH_MXC_AUDMUX_V1
|
|
bool
|
|
|
|
config ARCH_MXC_AUDMUX_V2
|
|
bool
|
|
|
|
config IRAM_ALLOC
|
|
bool
|
|
select GENERIC_ALLOCATOR
|
|
|
|
endif
|