* [GIT PULL] kconfig clean-up and mach-virt removal for 3.15
@ 2014-02-19 23:30 Rob Herring
2014-02-28 16:22 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Rob Herring @ 2014-02-19 23:30 UTC (permalink / raw)
To: linux-arm-kernel
Please pull for 3.15.
BTW, any new platforms for 3.15 will need to either be based on this
or I can clean-up their kconfig entries after they are merged.
Rob
The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:
Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
tags/kconfig-cleanup-for-3.15
for you to fetch changes up to 4b8b5f25b7485eaf60a40f68451b3b7b741eef59:
ARM: virt: select ARM_AMBA (2014-02-19 16:47:46 -0600)
----------------------------------------------------------------
- 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.
----------------------------------------------------------------
Rob Herring (9):
ARM: centralize common multi-platform kconfig options
ARM: select HAVE_SMP for V7 multi-platform
ARM: select MIGHT_HAVE_CACHE_L2X0 for V6 and V7 multi-platform
ARM: Select V6K instead of V6 by default for multi-platform
ARM: bcm2835: enable V6K instead of plain V6
ARM: cns3xxx: enable V6K instead of plain V6
ARM: vt8500: enable V6K instead of plain V6
ARM: virt: make mach-virt just a kconfig option
ARM: virt: select ARM_AMBA
arch/arm/Kconfig | 15 ++++++++++++---
arch/arm/Makefile | 1 -
arch/arm/mach-bcm/Kconfig | 5 -----
arch/arm/mach-bcm2835/Kconfig | 4 ----
arch/arm/mach-berlin/Kconfig | 4 ----
arch/arm/mach-cns3xxx/Kconfig | 3 ---
arch/arm/mach-highbank/Kconfig | 7 -------
arch/arm/mach-hisi/Kconfig | 4 ----
arch/arm/mach-imx/Kconfig | 14 --------------
arch/arm/mach-keystone/Kconfig | 4 ----
arch/arm/mach-moxart/Kconfig | 5 -----
arch/arm/mach-mvebu/Kconfig | 6 ------
arch/arm/mach-mxs/Kconfig | 4 ----
arch/arm/mach-nomadik/Kconfig | 5 -----
arch/arm/mach-nspire/Kconfig | 5 -----
arch/arm/mach-omap2/Kconfig | 17 -----------------
arch/arm/mach-picoxcell/Kconfig | 5 -----
arch/arm/mach-prima2/Kconfig | 6 ------
arch/arm/mach-rockchip/Kconfig | 3 ---
arch/arm/mach-shmobile/Kconfig | 5 -----
arch/arm/mach-socfpga/Kconfig | 7 -------
arch/arm/mach-spear/Kconfig | 10 ----------
arch/arm/mach-sti/Kconfig | 4 ----
arch/arm/mach-sunxi/Kconfig | 5 -----
arch/arm/mach-tegra/Kconfig | 8 --------
arch/arm/mach-u300/Kconfig | 6 ------
arch/arm/mach-ux500/Kconfig | 6 ------
arch/arm/mach-vexpress/Kconfig | 5 -----
arch/arm/mach-virt/Kconfig | 10 ----------
arch/arm/mach-virt/Makefile | 5 -----
arch/arm/mach-virt/virt.c | 41 -----------------------------------------
arch/arm/mach-vt8500/Kconfig | 4 ----
arch/arm/mach-zynq/Kconfig | 7 -------
33 files changed, 12 insertions(+), 228 deletions(-)
delete mode 100644 arch/arm/mach-virt/Kconfig
delete mode 100644 arch/arm/mach-virt/Makefile
delete mode 100644 arch/arm/mach-virt/virt.c
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] kconfig clean-up and mach-virt removal for 3.15
2014-02-19 23:30 [GIT PULL] kconfig clean-up and mach-virt removal for 3.15 Rob Herring
@ 2014-02-28 16:22 ` Arnd Bergmann
2014-02-28 17:55 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2014-02-28 16:22 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 20 February 2014, Rob Herring wrote:
-------------------------------------------
> - 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.
Merged into next/cleanup. Very much appreciated changes!
Thanks,
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] kconfig clean-up and mach-virt removal for 3.15
2014-02-28 16:22 ` Arnd Bergmann
@ 2014-02-28 17:55 ` Arnd Bergmann
2014-03-03 4:53 ` Shawn Guo
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2014-02-28 17:55 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 28 February 2014, Arnd Bergmann wrote:
> On Thursday 20 February 2014, Rob Herring wrote:
> -------------------------------------------
> > - 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.
>
> Merged into next/cleanup. Very much appreciated changes!
Shawn, a quick warning about this: the Kconfig changes apparently
cause a few conflicts with your tree in linux-next.
If you want to avoid them, you can merge
git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
tags/kconfig-cleanup-for-3.15
into the conflicting branches. I have merged it into arm-soc and
is a stable branch in next/cleanups.
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] kconfig clean-up and mach-virt removal for 3.15
2014-02-28 17:55 ` Arnd Bergmann
@ 2014-03-03 4:53 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2014-03-03 4:53 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Feb 28, 2014 at 06:55:18PM +0100, Arnd Bergmann wrote:
> On Friday 28 February 2014, Arnd Bergmann wrote:
> > On Thursday 20 February 2014, Rob Herring wrote:
> > -------------------------------------------
> > > - 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.
> >
> > Merged into next/cleanup. Very much appreciated changes!
>
> Shawn, a quick warning about this: the Kconfig changes apparently
> cause a few conflicts with your tree in linux-next.
>
> If you want to avoid them, you can merge
>
> git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
> tags/kconfig-cleanup-for-3.15
>
> into the conflicting branches. I have merged it into arm-soc and
> is a stable branch in next/cleanups.
Ok, will do. Thanks for the heads-up.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-03 4:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-19 23:30 [GIT PULL] kconfig clean-up and mach-virt removal for 3.15 Rob Herring
2014-02-28 16:22 ` Arnd Bergmann
2014-02-28 17:55 ` Arnd Bergmann
2014-03-03 4:53 ` Shawn Guo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).