[PATCH 0/2] ARM: sunxi: Split Kconfig entries

[PATCH 0/2] ARM: sunxi: Split Kconfig entries

[Maxime Ripard]

Hi everyone,

This patch adds a few Kconfig option for all the supported Allwinner
SoCs family.

Hopefully, this will reduce the size of the kernel images when we're
interested in only or a few of these family, but not all of them.

Maxime Ripard (2):
  ARM: sunxi: Split the various SoCs support in Kconfig
  ARM: Enable the new Allwinner SoCs support options

 arch/arm/configs/multi_v7_defconfig |  6 ++++++
 arch/arm/configs/sunxi_defconfig    |  5 +++++
 arch/arm/mach-sunxi/Kconfig         | 35 +++++++++++++++++++++++++++++------
 3 files changed, 40 insertions(+), 6 deletions(-)

-- 
1.9.1

[PATCH 1/2] ARM: sunxi: Split the various SoCs support in Kconfig

[Maxime Ripard]

This will allow to better isolate various options, and reduce the overall
kernel size if we're interested in only one of the SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/mach-sunxi/Kconfig | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index b57d7d53b9d3..23575010ff49 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,14 +1,37 @@
 config ARCH_SUNXI
-	bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
-	select ARCH_HAS_RESET_CONTROLLER
+	bool "Allwinner SoCs" if ARCH_MULTI_V7
 	select ARCH_REQUIRE_GPIOLIB
-	select ARM_GIC
-	select ARM_PSCI
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
-	select HAVE_ARM_ARCH_TIMER
 	select PINCTRL
 	select PINCTRL_SUNXI
-	select RESET_CONTROLLER
 	select SUN4I_TIMER
+
+if ARCH_SUNXI
+
+menu "Allwinner SoCs variants"
+
+config MACH_SUN4I
+	bool "Allwinner A10 (sun4i) SoCs support"
+
+config MACH_SUN5I
+	bool "Allwinner A10s / A13 (sun5i) SoCs support"
+	select SUN5I_HSTIMER
+
+config MACH_SUN6I
+	bool "Allwinner A31 (sun6i) SoCs support"
+	select ARCH_HAS_RESET_CONTROLLER
+	select ARM_GIC
+	select RESET_CONTROLLER
+	select SUN5I_HSTIMER
+
+config MACH_SUN7I
+	bool "Allwinner A20 (sun7i) SoCs support"
+	select ARM_GIC
+	select ARM_PSCI
+	select HAVE_ARM_ARCH_TIMER
 	select SUN5I_HSTIMER
+
+endmenu
+
+endif
-- 
1.9.1

[linux-sunxi] [PATCH 1/2] ARM: sunxi: Split the various SoCs support in Kconfig

[Olof Johansson]

Hi,

On Sat, Apr 26, 2014 at 9:16 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> This will allow to better isolate various options, and reduce the overall
> kernel size if we're interested in only one of the SoCs.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/mach-sunxi/Kconfig | 35 +++++++++++++++++++++++++++++------
>  1 file changed, 29 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index b57d7d53b9d3..23575010ff49 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -1,14 +1,37 @@
>  config ARCH_SUNXI
> -       bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
> -       select ARCH_HAS_RESET_CONTROLLER
> +       bool "Allwinner SoCs" if ARCH_MULTI_V7
>         select ARCH_REQUIRE_GPIOLIB
> -       select ARM_GIC
> -       select ARM_PSCI
>         select CLKSRC_MMIO
>         select GENERIC_IRQ_CHIP
> -       select HAVE_ARM_ARCH_TIMER
>         select PINCTRL
>         select PINCTRL_SUNXI
> -       select RESET_CONTROLLER
>         select SUN4I_TIMER
> +
> +if ARCH_SUNXI
> +
> +menu "Allwinner SoCs variants"
> +
> +config MACH_SUN4I
> +       bool "Allwinner A10 (sun4i) SoCs support"

If you add "default MACH_SUNXI" then you don't have to churn the
defconfigs, but it'll still make it possible for people to turn it
off.


-Olof

[linux-sunxi] [PATCH 1/2] ARM: sunxi: Split the various SoCs support in Kconfig

[Maxime Ripard]

On Mon, Apr 28, 2014 at 10:02:40AM -0700, Olof Johansson wrote:
> Hi,
> 
> On Sat, Apr 26, 2014 at 9:16 AM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > This will allow to better isolate various options, and reduce the overall
> > kernel size if we're interested in only one of the SoCs.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> >  arch/arm/mach-sunxi/Kconfig | 35 +++++++++++++++++++++++++++++------
> >  1 file changed, 29 insertions(+), 6 deletions(-)
> >
> > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> > index b57d7d53b9d3..23575010ff49 100644
> > --- a/arch/arm/mach-sunxi/Kconfig
> > +++ b/arch/arm/mach-sunxi/Kconfig
> > @@ -1,14 +1,37 @@
> >  config ARCH_SUNXI
> > -       bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
> > -       select ARCH_HAS_RESET_CONTROLLER
> > +       bool "Allwinner SoCs" if ARCH_MULTI_V7
> >         select ARCH_REQUIRE_GPIOLIB
> > -       select ARM_GIC
> > -       select ARM_PSCI
> >         select CLKSRC_MMIO
> >         select GENERIC_IRQ_CHIP
> > -       select HAVE_ARM_ARCH_TIMER
> >         select PINCTRL
> >         select PINCTRL_SUNXI
> > -       select RESET_CONTROLLER
> >         select SUN4I_TIMER
> > +
> > +if ARCH_SUNXI
> > +
> > +menu "Allwinner SoCs variants"
> > +
> > +config MACH_SUN4I
> > +       bool "Allwinner A10 (sun4i) SoCs support"
> 
> If you add "default MACH_SUNXI" then you don't have to churn the
> defconfigs, but it'll still make it possible for people to turn it
> off.

Right, thanks!

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140428/7c83757b/attachment.sig>

[PATCH 1/2] ARM: sunxi: Split the various SoCs support in Kconfig

[Arnd Bergmann]

On Saturday 26 April 2014 18:16:53 Maxime Ripard wrote:
> This will allow to better isolate various options, and reduce the overall
> kernel size if we're interested in only one of the SoCs.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Looks good, just one small request:


> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index b57d7d53b9d3..23575010ff49 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -1,14 +1,37 @@
>  config ARCH_SUNXI
> -       bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
> -       select ARCH_HAS_RESET_CONTROLLER
> +       bool "Allwinner SoCs" if ARCH_MULTI_V7
>         select ARCH_REQUIRE_GPIOLIB
> -       select ARM_GIC
> -       select ARM_PSCI
>         select CLKSRC_MMIO
>         select GENERIC_IRQ_CHIP
> -       select HAVE_ARM_ARCH_TIMER
>         select PINCTRL
>         select PINCTRL_SUNXI
> -       select RESET_CONTROLLER
>         select SUN4I_TIMER

Please make this 'menuconfig' instead of 'config', so it shows up as
only one line in the main menu. I would like to do this for all platforms
that have sub-options eventually.

	Arnd

[PATCH 1/2] ARM: sunxi: Split the various SoCs support in Kconfig

[Maxime Ripard]

On Mon, Apr 28, 2014 at 08:07:38PM +0200, Arnd Bergmann wrote:
> On Saturday 26 April 2014 18:16:53 Maxime Ripard wrote:
> > This will allow to better isolate various options, and reduce the overall
> > kernel size if we're interested in only one of the SoCs.
> > 
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> 
> Looks good, just one small request:
> 
> 
> > diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> > index b57d7d53b9d3..23575010ff49 100644
> > --- a/arch/arm/mach-sunxi/Kconfig
> > +++ b/arch/arm/mach-sunxi/Kconfig
> > @@ -1,14 +1,37 @@
> >  config ARCH_SUNXI
> > -       bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
> > -       select ARCH_HAS_RESET_CONTROLLER
> > +       bool "Allwinner SoCs" if ARCH_MULTI_V7
> >         select ARCH_REQUIRE_GPIOLIB
> > -       select ARM_GIC
> > -       select ARM_PSCI
> >         select CLKSRC_MMIO
> >         select GENERIC_IRQ_CHIP
> > -       select HAVE_ARM_ARCH_TIMER
> >         select PINCTRL
> >         select PINCTRL_SUNXI
> > -       select RESET_CONTROLLER
> >         select SUN4I_TIMER
> 
> Please make this 'menuconfig' instead of 'config', so it shows up as
> only one line in the main menu. I would like to do this for all platforms
> that have sub-options eventually.

Ok, sure, I'll send a v2 with Olof comments as well.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140428/b7df91d3/attachment.sig>

[PATCH 2/2] ARM: Enable the new Allwinner SoCs support options

[Maxime Ripard]

Enable the new Kconfig option related to SoC support in multi_v7 and sunxi
defconfigs.

While we're at it, also enable the missing Allwinnner SPI options.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/configs/multi_v7_defconfig | 6 ++++++
 arch/arm/configs/sunxi_defconfig    | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d4e8a47a2f7c..f5fcfc142691 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -48,6 +48,10 @@ CONFIG_MACH_SPEAR1310=y
 CONFIG_MACH_SPEAR1340=y
 CONFIG_ARCH_STI=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
 CONFIG_ARCH_SIRF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
@@ -184,6 +188,8 @@ CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_ORION=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_SIRF=y
+CONFIG_SPI_SUN4I=y
+CONFIG_SPI_SUN6I=y
 CONFIG_SPI_TEGRA114=y
 CONFIG_SPI_TEGRA20_SFLASH=y
 CONFIG_SPI_TEGRA20_SLINK=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index b5df4a511b0a..78732ed10d0e 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -2,6 +2,10 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
 CONFIG_SMP=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
@@ -50,6 +54,7 @@ CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_SPI=y
+CONFIG_SPI_SUN4I=y
 CONFIG_SPI_SUN6I=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
-- 
1.9.1