diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mm/Kconfig | 1 |
4 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bb68e65ab180..a48aecc17eac 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -825,7 +825,6 @@ config ARCH_S5PC100 | |||
| 825 | select HAVE_CLK | 825 | select HAVE_CLK |
| 826 | select CLKDEV_LOOKUP | 826 | select CLKDEV_LOOKUP |
| 827 | select CPU_V7 | 827 | select CPU_V7 |
| 828 | select ARM_L1_CACHE_SHIFT_6 | ||
| 829 | select ARCH_USES_GETTIMEOFFSET | 828 | select ARCH_USES_GETTIMEOFFSET |
| 830 | select HAVE_S3C2410_I2C if I2C | 829 | select HAVE_S3C2410_I2C if I2C |
| 831 | select HAVE_S3C_RTC if RTC_CLASS | 830 | select HAVE_S3C_RTC if RTC_CLASS |
| @@ -842,7 +841,6 @@ config ARCH_S5PV210 | |||
| 842 | select HAVE_CLK | 841 | select HAVE_CLK |
| 843 | select CLKDEV_LOOKUP | 842 | select CLKDEV_LOOKUP |
| 844 | select CLKSRC_MMIO | 843 | select CLKSRC_MMIO |
| 845 | select ARM_L1_CACHE_SHIFT_6 | ||
| 846 | select ARCH_HAS_CPUFREQ | 844 | select ARCH_HAS_CPUFREQ |
| 847 | select GENERIC_CLOCKEVENTS | 845 | select GENERIC_CLOCKEVENTS |
| 848 | select HAVE_SCHED_CLOCK | 846 | select HAVE_SCHED_CLOCK |
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig index af0c212e3c7b..9cf4c3c1914d 100644 --- a/arch/arm/mach-mx5/Kconfig +++ b/arch/arm/mach-mx5/Kconfig | |||
| @@ -15,7 +15,6 @@ config ARCH_MX53 | |||
| 15 | config SOC_IMX50 | 15 | config SOC_IMX50 |
| 16 | bool | 16 | bool |
| 17 | select CPU_V7 | 17 | select CPU_V7 |
| 18 | select ARM_L1_CACHE_SHIFT_6 | ||
| 19 | select MXC_TZIC | 18 | select MXC_TZIC |
| 20 | select ARCH_MXC_IOMUX_V3 | 19 | select ARCH_MXC_IOMUX_V3 |
| 21 | select ARCH_MXC_AUDMUX_V2 | 20 | select ARCH_MXC_AUDMUX_V2 |
| @@ -25,7 +24,6 @@ config SOC_IMX50 | |||
| 25 | config SOC_IMX51 | 24 | config SOC_IMX51 |
| 26 | bool | 25 | bool |
| 27 | select CPU_V7 | 26 | select CPU_V7 |
| 28 | select ARM_L1_CACHE_SHIFT_6 | ||
| 29 | select MXC_TZIC | 27 | select MXC_TZIC |
| 30 | select ARCH_MXC_IOMUX_V3 | 28 | select ARCH_MXC_IOMUX_V3 |
| 31 | select ARCH_MXC_AUDMUX_V2 | 29 | select ARCH_MXC_AUDMUX_V2 |
| @@ -35,7 +33,6 @@ config SOC_IMX51 | |||
| 35 | config SOC_IMX53 | 33 | config SOC_IMX53 |
| 36 | bool | 34 | bool |
| 37 | select CPU_V7 | 35 | select CPU_V7 |
| 38 | select ARM_L1_CACHE_SHIFT_6 | ||
| 39 | select MXC_TZIC | 36 | select MXC_TZIC |
| 40 | select ARCH_MXC_IOMUX_V3 | 37 | select ARCH_MXC_IOMUX_V3 |
| 41 | select ARCH_MX53 | 38 | select ARCH_MX53 |
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index a8ba7b96dcd1..41e6612ecbaf 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -33,7 +33,6 @@ config ARCH_OMAP3 | |||
| 33 | default y | 33 | default y |
| 34 | select CPU_V7 | 34 | select CPU_V7 |
| 35 | select USB_ARCH_HAS_EHCI | 35 | select USB_ARCH_HAS_EHCI |
| 36 | select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 | ||
| 37 | select ARCH_HAS_OPP | 36 | select ARCH_HAS_OPP |
| 38 | select PM_OPP if PM | 37 | select PM_OPP if PM |
| 39 | select ARM_CPU_SUSPEND if PM | 38 | select ARM_CPU_SUSPEND if PM |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 4cefb57d9ed2..1a3ca2488164 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -882,6 +882,7 @@ config CACHE_XSC3L2 | |||
| 882 | 882 | ||
| 883 | config ARM_L1_CACHE_SHIFT_6 | 883 | config ARM_L1_CACHE_SHIFT_6 |
| 884 | bool | 884 | bool |
| 885 | default y if CPU_V7 | ||
| 885 | help | 886 | help |
| 886 | Setting ARM L1 cache line size to 64 Bytes. | 887 | Setting ARM L1 cache line size to 64 Bytes. |
| 887 | 888 | ||