diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 17:50:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-23 17:50:30 -0500 |
commit | eaed435a7b870a38d89dbdb535c7842d618d3214 (patch) | |
tree | 75c2d90c7c1fa937fc83027699fad1455644df8e /arch/arm/mach-imx/Kconfig | |
parent | a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99 (diff) | |
parent | 3f07f355704bc2ae26399f17c6d5d46c9a3d78d1 (diff) |
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.
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
-rw-r--r-- | arch/arm/mach-imx/Kconfig | 239 |
1 files changed, 239 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 0e6de366c64..09f357bcecd 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
@@ -22,6 +22,18 @@ config ARCH_MX25 | |||
22 | config MACH_MX27 | 22 | config MACH_MX27 |
23 | bool | 23 | bool |
24 | 24 | ||
25 | config ARCH_MX5 | ||
26 | bool | ||
27 | |||
28 | config ARCH_MX50 | ||
29 | bool | ||
30 | |||
31 | config ARCH_MX51 | ||
32 | bool | ||
33 | |||
34 | config ARCH_MX53 | ||
35 | bool | ||
36 | |||
25 | config SOC_IMX1 | 37 | config SOC_IMX1 |
26 | bool | 38 | bool |
27 | select ARCH_MX1 | 39 | select ARCH_MX1 |
@@ -73,6 +85,32 @@ config SOC_IMX35 | |||
73 | select MXC_AVIC | 85 | select MXC_AVIC |
74 | select SMP_ON_UP if SMP | 86 | select SMP_ON_UP if SMP |
75 | 87 | ||
88 | config SOC_IMX5 | ||
89 | select CPU_V7 | ||
90 | select ARM_L1_CACHE_SHIFT_6 | ||
91 | select MXC_TZIC | ||
92 | select ARCH_MXC_IOMUX_V3 | ||
93 | select ARCH_MXC_AUDMUX_V2 | ||
94 | select ARCH_HAS_CPUFREQ | ||
95 | select ARCH_MX5 | ||
96 | bool | ||
97 | |||
98 | config SOC_IMX50 | ||
99 | bool | ||
100 | select SOC_IMX5 | ||
101 | select ARCH_MX50 | ||
102 | |||
103 | config SOC_IMX51 | ||
104 | bool | ||
105 | select SOC_IMX5 | ||
106 | select ARCH_MX5 | ||
107 | select ARCH_MX51 | ||
108 | |||
109 | config SOC_IMX53 | ||
110 | bool | ||
111 | select SOC_IMX5 | ||
112 | select ARCH_MX5 | ||
113 | select ARCH_MX53 | ||
76 | 114 | ||
77 | if ARCH_IMX_V4_V5 | 115 | if ARCH_IMX_V4_V5 |
78 | 116 | ||
@@ -592,6 +630,207 @@ config MACH_VPR200 | |||
592 | Include support for VPR200 platform. This includes specific | 630 | Include support for VPR200 platform. This includes specific |
593 | configurations for the board and its peripherals. | 631 | configurations for the board and its peripherals. |
594 | 632 | ||
633 | comment "i.MX5 platforms:" | ||
634 | |||
635 | config MACH_MX50_RDP | ||
636 | bool "Support MX50 reference design platform" | ||
637 | depends on BROKEN | ||
638 | select SOC_IMX50 | ||
639 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
640 | select IMX_HAVE_PLATFORM_IMX_UART | ||
641 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
642 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
643 | help | ||
644 | Include support for MX50 reference design platform (RDP) board. This | ||
645 | includes specific configurations for the board and its peripherals. | ||
646 | |||
647 | comment "i.MX51 machines:" | ||
648 | |||
649 | config MACH_IMX51_DT | ||
650 | bool "Support i.MX51 platforms from device tree" | ||
651 | select SOC_IMX51 | ||
652 | select USE_OF | ||
653 | select MACH_MX51_BABBAGE | ||
654 | help | ||
655 | Include support for Freescale i.MX51 based platforms | ||
656 | using the device tree for discovery | ||
657 | |||
658 | config MACH_MX51_BABBAGE | ||
659 | bool "Support MX51 BABBAGE platforms" | ||
660 | select SOC_IMX51 | ||
661 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | ||
662 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
663 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
664 | select IMX_HAVE_PLATFORM_IMX_UART | ||
665 | select IMX_HAVE_PLATFORM_MXC_EHCI | ||
666 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
667 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
668 | help | ||
669 | Include support for MX51 Babbage platform, also known as MX51EVK in | ||
670 | u-boot. This includes specific configurations for the board and its | ||
671 | peripherals. | ||
672 | |||
673 | config MACH_MX51_3DS | ||
674 | bool "Support MX51PDK (3DS)" | ||
675 | select SOC_IMX51 | ||
676 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
677 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | ||
678 | select IMX_HAVE_PLATFORM_IMX_UART | ||
679 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
680 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
681 | select MXC_DEBUG_BOARD | ||
682 | help | ||
683 | Include support for MX51PDK (3DS) platform. This includes specific | ||
684 | configurations for the board and its peripherals. | ||
685 | |||
686 | config MACH_EUKREA_CPUIMX51 | ||
687 | bool "Support Eukrea CPUIMX51 module" | ||
688 | select SOC_IMX51 | ||
689 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | ||
690 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
691 | select IMX_HAVE_PLATFORM_IMX_UART | ||
692 | select IMX_HAVE_PLATFORM_MXC_EHCI | ||
693 | select IMX_HAVE_PLATFORM_MXC_NAND | ||
694 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
695 | help | ||
696 | Include support for Eukrea CPUIMX51 platform. This includes | ||
697 | specific configurations for the module and its peripherals. | ||
698 | |||
699 | choice | ||
700 | prompt "Baseboard" | ||
701 | depends on MACH_EUKREA_CPUIMX51 | ||
702 | default MACH_EUKREA_MBIMX51_BASEBOARD | ||
703 | |||
704 | config MACH_EUKREA_MBIMX51_BASEBOARD | ||
705 | prompt "Eukrea MBIMX51 development board" | ||
706 | bool | ||
707 | select IMX_HAVE_PLATFORM_IMX_KEYPAD | ||
708 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
709 | select LEDS_GPIO_REGISTER | ||
710 | help | ||
711 | This adds board specific devices that can be found on Eukrea's | ||
712 | MBIMX51 evaluation board. | ||
713 | |||
714 | endchoice | ||
715 | |||
716 | config MACH_EUKREA_CPUIMX51SD | ||
717 | bool "Support Eukrea CPUIMX51SD module" | ||
718 | select SOC_IMX51 | ||
719 | select IMX_HAVE_PLATFORM_FSL_USB2_UDC | ||
720 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
721 | select IMX_HAVE_PLATFORM_IMX_UART | ||
722 | select IMX_HAVE_PLATFORM_MXC_EHCI | ||
723 | select IMX_HAVE_PLATFORM_MXC_NAND | ||
724 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
725 | help | ||
726 | Include support for Eukrea CPUIMX51SD platform. This includes | ||
727 | specific configurations for the module and its peripherals. | ||
728 | |||
729 | choice | ||
730 | prompt "Baseboard" | ||
731 | depends on MACH_EUKREA_CPUIMX51SD | ||
732 | default MACH_EUKREA_MBIMXSD51_BASEBOARD | ||
733 | |||
734 | config MACH_EUKREA_MBIMXSD51_BASEBOARD | ||
735 | prompt "Eukrea MBIMXSD development board" | ||
736 | bool | ||
737 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
738 | select LEDS_GPIO_REGISTER | ||
739 | help | ||
740 | This adds board specific devices that can be found on Eukrea's | ||
741 | MBIMXSD evaluation board. | ||
742 | |||
743 | endchoice | ||
744 | |||
745 | config MX51_EFIKA_COMMON | ||
746 | bool | ||
747 | select SOC_IMX51 | ||
748 | select IMX_HAVE_PLATFORM_IMX_UART | ||
749 | select IMX_HAVE_PLATFORM_MXC_EHCI | ||
750 | select IMX_HAVE_PLATFORM_PATA_IMX | ||
751 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
752 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
753 | select MXC_ULPI if USB_ULPI | ||
754 | |||
755 | config MACH_MX51_EFIKAMX | ||
756 | bool "Support MX51 Genesi Efika MX nettop" | ||
757 | select LEDS_GPIO_REGISTER | ||
758 | select MX51_EFIKA_COMMON | ||
759 | help | ||
760 | Include support for Genesi Efika MX nettop. This includes specific | ||
761 | configurations for the board and its peripherals. | ||
762 | |||
763 | config MACH_MX51_EFIKASB | ||
764 | bool "Support MX51 Genesi Efika Smartbook" | ||
765 | select LEDS_GPIO_REGISTER | ||
766 | select MX51_EFIKA_COMMON | ||
767 | help | ||
768 | Include support for Genesi Efika Smartbook. This includes specific | ||
769 | configurations for the board and its peripherals. | ||
770 | |||
771 | comment "i.MX53 machines:" | ||
772 | |||
773 | config MACH_IMX53_DT | ||
774 | bool "Support i.MX53 platforms from device tree" | ||
775 | select SOC_IMX53 | ||
776 | select USE_OF | ||
777 | select MACH_MX53_ARD | ||
778 | select MACH_MX53_EVK | ||
779 | select MACH_MX53_LOCO | ||
780 | select MACH_MX53_SMD | ||
781 | help | ||
782 | Include support for Freescale i.MX53 based platforms | ||
783 | using the device tree for discovery | ||
784 | |||
785 | config MACH_MX53_EVK | ||
786 | bool "Support MX53 EVK platforms" | ||
787 | select SOC_IMX53 | ||
788 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
789 | select IMX_HAVE_PLATFORM_IMX_UART | ||
790 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
791 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
792 | select IMX_HAVE_PLATFORM_SPI_IMX | ||
793 | select LEDS_GPIO_REGISTER | ||
794 | help | ||
795 | Include support for MX53 EVK platform. This includes specific | ||
796 | configurations for the board and its peripherals. | ||
797 | |||
798 | config MACH_MX53_SMD | ||
799 | bool "Support MX53 SMD platforms" | ||
800 | select SOC_IMX53 | ||
801 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
802 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
803 | select IMX_HAVE_PLATFORM_IMX_UART | ||
804 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
805 | help | ||
806 | Include support for MX53 SMD platform. This includes specific | ||
807 | configurations for the board and its peripherals. | ||
808 | |||
809 | config MACH_MX53_LOCO | ||
810 | bool "Support MX53 LOCO platforms" | ||
811 | select SOC_IMX53 | ||
812 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
813 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
814 | select IMX_HAVE_PLATFORM_IMX_UART | ||
815 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
816 | select IMX_HAVE_PLATFORM_GPIO_KEYS | ||
817 | select LEDS_GPIO_REGISTER | ||
818 | help | ||
819 | Include support for MX53 LOCO platform. This includes specific | ||
820 | configurations for the board and its peripherals. | ||
821 | |||
822 | config MACH_MX53_ARD | ||
823 | bool "Support MX53 ARD platforms" | ||
824 | select SOC_IMX53 | ||
825 | select IMX_HAVE_PLATFORM_IMX2_WDT | ||
826 | select IMX_HAVE_PLATFORM_IMX_I2C | ||
827 | select IMX_HAVE_PLATFORM_IMX_UART | ||
828 | select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX | ||
829 | select IMX_HAVE_PLATFORM_GPIO_KEYS | ||
830 | help | ||
831 | Include support for MX53 ARD platform. This includes specific | ||
832 | configurations for the board and its peripherals. | ||
833 | |||
595 | comment "i.MX6 family:" | 834 | comment "i.MX6 family:" |
596 | 835 | ||
597 | config SOC_IMX6Q | 836 | config SOC_IMX6Q |