diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2014-03-05 10:31:54 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-03-05 10:31:54 +0800 |
| commit | c1b2a174c33ae2bd453e40199de4f93c684500e6 (patch) | |
| tree | 9d9cecb2a54ef223969dfced6eeff4639a080b8c /arch/arm/mach-picoxcell/Kconfig | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff) | |
| download | blackbird-obmc-linux-c1b2a174c33ae2bd453e40199de4f93c684500e6.tar.gz blackbird-obmc-linux-c1b2a174c33ae2bd453e40199de4f93c684500e6.zip | |
Merge tag 'kconfig-cleanup-for-3.15' into imx/soc
- Remove common kconfig options required by multi-platform builds out
of individual platforms as they are redundant.
- Make SMP, CACHE_L2X0 and GPIO config options user visible on
multi-platform builds as most platforms enable these options and all
platforms can run with them enabled.
- Make multi-platform v6 default to more optimal v6k rather than v6
- Remove the last bit of mach-virt and convert it to just a kconfig
option.
Conflicts:
arch/arm/mach-omap2/Kconfig
Diffstat (limited to 'arch/arm/mach-picoxcell/Kconfig')
| -rw-r--r-- | arch/arm/mach-picoxcell/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig index b1022f4315f7..eca9eb1c5931 100644 --- a/arch/arm/mach-picoxcell/Kconfig +++ b/arch/arm/mach-picoxcell/Kconfig @@ -1,12 +1,7 @@ config ARCH_PICOXCELL bool "Picochip PicoXcell" if ARCH_MULTI_V6 select ARCH_REQUIRE_GPIOLIB - select ARM_PATCH_PHYS_VIRT select ARM_VIC - select CPU_V6K select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS select HAVE_TCM select NO_IOPORT - select SPARSE_IRQ - select USE_OF |
