提交 7378a62b 编写于 作者: S Sascha Hauer

Merge branch 'cleanups/remove-unused-kconfig' into imx-fixes-for-arnd

...@@ -10,11 +10,6 @@ config HAVE_IMX_MMDC ...@@ -10,11 +10,6 @@ config HAVE_IMX_MMDC
config HAVE_IMX_SRC config HAVE_IMX_SRC
bool 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.
# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
# more sensible) names are used: SOC_IMX31 and SOC_IMX35
config ARCH_MX1 config ARCH_MX1
bool bool
...@@ -27,12 +22,6 @@ config ARCH_MX25 ...@@ -27,12 +22,6 @@ config ARCH_MX25
config MACH_MX27 config MACH_MX27
bool bool
config ARCH_MX31
bool
config ARCH_MX35
bool
config SOC_IMX1 config SOC_IMX1
bool bool
select ARCH_MX1 select ARCH_MX1
...@@ -72,7 +61,6 @@ config SOC_IMX31 ...@@ -72,7 +61,6 @@ config SOC_IMX31
select CPU_V6 select CPU_V6
select IMX_HAVE_PLATFORM_MXC_RNGA select IMX_HAVE_PLATFORM_MXC_RNGA
select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_AUDMUX_V2
select ARCH_MX31
select MXC_AVIC select MXC_AVIC
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
...@@ -82,7 +70,6 @@ config SOC_IMX35 ...@@ -82,7 +70,6 @@ config SOC_IMX35
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
select ARCH_MXC_AUDMUX_V2 select ARCH_MXC_AUDMUX_V2
select HAVE_EPIT select HAVE_EPIT
select ARCH_MX35
select MXC_AVIC select MXC_AVIC
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册