[PATCH 0/5] RealView boardfile removal

[PATCH 0/5] RealView boardfile removal

[Linus Walleij]

This is a repost of the earlier posted RealView boardfile
removal patchset: now that Tomi has merged the CLCD patches
this can be merged, ridding the world from another ton of
boardfiles, with all RealView variants booting just as nicely
as before.

Vladimir's patch and some new patches on top are added to
reduce the Kconfig mess, looking for ACKs from MTD and
irqchips to merge that. Will send a pull request after some
ACK grace time.

Linus Walleij (4):
  ARM: realview: delete the RealView board files
  ARM: realview: reduce the RealView Kconfig
  ARM: realview: cut board options from defconfig
  ARM: realview: imply device tree boot

Vladimir Murzin (1):
  ARM: realview: no need to select SMP_ON_UP explicitly

 arch/arm/configs/realview_defconfig      |  11 -
 arch/arm/mach-realview/Kconfig           | 145 +--------
 arch/arm/mach-realview/Makefile          |  12 +-
 arch/arm/mach-realview/board-eb.h        |  94 ------
 arch/arm/mach-realview/board-pb1176.h    |  81 -----
 arch/arm/mach-realview/board-pb11mp.h    |  96 ------
 arch/arm/mach-realview/board-pba8.h      |  71 -----
 arch/arm/mach-realview/board-pbx.h       | 106 -------
 arch/arm/mach-realview/core.c            | 404 -------------------------
 arch/arm/mach-realview/core.h            |  58 ----
 arch/arm/mach-realview/hardware.h        |  40 ---
 arch/arm/mach-realview/hotplug.h         |   1 +
 arch/arm/mach-realview/irqs-eb.h         | 114 -------
 arch/arm/mach-realview/irqs-pb1176.h     |  77 -----
 arch/arm/mach-realview/irqs-pb11mp.h     |  97 ------
 arch/arm/mach-realview/irqs-pba8.h       |  71 -----
 arch/arm/mach-realview/irqs-pbx.h        |  87 ------
 arch/arm/mach-realview/platform.h        | 247 ----------------
 arch/arm/mach-realview/platsmp-dt.c      |   3 +-
 arch/arm/mach-realview/platsmp.c         |  86 ------
 arch/arm/mach-realview/realview_eb.c     | 492 -------------------------------
 arch/arm/mach-realview/realview_pb1176.c | 395 -------------------------
 arch/arm/mach-realview/realview_pb11mp.c | 385 ------------------------
 arch/arm/mach-realview/realview_pba8.c   | 307 -------------------
 arch/arm/mach-realview/realview_pbx.c    | 402 -------------------------
 drivers/irqchip/Makefile                 |   2 +-
 drivers/mtd/maps/Kconfig                 |   2 +-
 27 files changed, 18 insertions(+), 3868 deletions(-)
 delete mode 100644 arch/arm/mach-realview/board-eb.h
 delete mode 100644 arch/arm/mach-realview/board-pb1176.h
 delete mode 100644 arch/arm/mach-realview/board-pb11mp.h
 delete mode 100644 arch/arm/mach-realview/board-pba8.h
 delete mode 100644 arch/arm/mach-realview/board-pbx.h
 delete mode 100644 arch/arm/mach-realview/core.c
 delete mode 100644 arch/arm/mach-realview/core.h
 delete mode 100644 arch/arm/mach-realview/hardware.h
 create mode 100644 arch/arm/mach-realview/hotplug.h
 delete mode 100644 arch/arm/mach-realview/irqs-eb.h
 delete mode 100644 arch/arm/mach-realview/irqs-pb1176.h
 delete mode 100644 arch/arm/mach-realview/irqs-pb11mp.h
 delete mode 100644 arch/arm/mach-realview/irqs-pba8.h
 delete mode 100644 arch/arm/mach-realview/irqs-pbx.h
 delete mode 100644 arch/arm/mach-realview/platform.h
 delete mode 100644 arch/arm/mach-realview/platsmp.c
 delete mode 100644 arch/arm/mach-realview/realview_eb.c
 delete mode 100644 arch/arm/mach-realview/realview_pb1176.c
 delete mode 100644 arch/arm/mach-realview/realview_pb11mp.c
 delete mode 100644 arch/arm/mach-realview/realview_pba8.c
 delete mode 100644 arch/arm/mach-realview/realview_pbx.c

-- 
2.7.4

[PATCH 2/5] ARM: realview: reduce the RealView Kconfig

[Linus Walleij]

We select all we need to the device tree boot and and do not
really need all the sub-options to get this running smoothly.
We will support the ARMv5, ARMv6, ARMv7 or ARMv6+ARMv7
build depending on what the user selects.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-realview/Kconfig | 127 +++--------------------------------------
 1 file changed, 8 insertions(+), 119 deletions(-)

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 70ab4a25a5f8..a52b35aeca86 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -17,9 +17,13 @@ config REALVIEW_DT
 	bool "Support RealView(R) Device Tree based boot"
 	select ARM_GIC
 	select CLK_SP810
-	select HAVE_SMP
+	select CPU_ARM926T if ARCH_MULTI_V5
+	select HAVE_ARM_SCU if SMP
+	select HAVE_ARM_TWD if SMP
+	select HAVE_PATA_PLATFORM
+	select HAVE_SMP if ARCH_MULTI_V6
+	select HAVE_TCM
 	select ICST
-	select MACH_REALVIEW_EB if ARCH_MULTI_V5
 	select MFD_SYSCON
 	select POWER_RESET
 	select POWER_RESET_VERSATILE
@@ -27,129 +31,14 @@ config REALVIEW_DT
 	select SMP_ON_UP if SMP
 	select SOC_REALVIEW
 	select USE_OF
+	select ZONE_DMA
 	help
 	  Include support for booting the ARM(R) RealView(R) evaluation
 	  boards using a device tree machine description.
 
-config MACH_REALVIEW_EB
-	bool "Support RealView(R) Emulation Baseboard"
-	select ARM_GIC
-	select CPU_ARM926T if ARCH_MULTI_V5
-	help
-	  Include support for the ARM(R) RealView(R) Emulation Baseboard
-	  platform. On an ARMv5 kernel, this will include support for
-	  the ARM926EJ-S core tile, while on an ARMv6/v7 kernel, at least
-	  one of the ARM1136, ARM1176, ARM11MPCore or Cortex-A9MPCore
-	  core tile options should be enabled.
-
-config REALVIEW_EB_ARM1136
-	bool "Support ARM1136J(F)-S Tile"
-	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
-	select CPU_V6
-	help
-	  Enable support for the ARM1136 tile fitted to the
-	  Realview(R) Emulation Baseboard platform.
-
-config REALVIEW_EB_ARM1176
-	bool "Support ARM1176JZ(F)-S Tile"
-	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
-	help
-	  Enable support for the ARM1176 tile fitted to the
-	  Realview(R) Emulation Baseboard platform.
-
-config REALVIEW_EB_A9MP
-	bool "Support Multicore Cortex-A9 Tile"
-	depends on MACH_REALVIEW_EB && ARCH_MULTI_V7
-	select HAVE_ARM_SCU if SMP
-	select HAVE_ARM_TWD if SMP
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	help
-	  Enable support for the Cortex-A9MPCore tile fitted to the
-	  Realview(R) Emulation Baseboard platform.
-
-config REALVIEW_EB_ARM11MP
-	bool "Support ARM11MPCore Tile"
-	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
-	select HAVE_ARM_SCU if SMP
-	select HAVE_ARM_TWD if SMP
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	help
-	  Enable support for the ARM11MPCore tile fitted to the Realview(R)
-	  Emulation Baseboard platform.
-
-config REALVIEW_EB_ARM11MP_REVB
-	bool "Support ARM11MPCore RevB Tile"
-	depends on REALVIEW_EB_ARM11MP && ARCH_MULTI_V6
-	help
-	  Enable support for the ARM11MPCore Revision B tile on the
-	  Realview(R) Emulation Baseboard platform. Since there are device
-	  address differences, a kernel built with this option enabled is
-	  not compatible with other revisions of the ARM11MPCore tile.
-
-config MACH_REALVIEW_PB11MP
-	bool "Support RealView(R) Platform Baseboard for ARM11MPCore"
-	depends on ARCH_MULTI_V6
-	select ARM_GIC
-	select HAVE_ARM_SCU if SMP
-	select HAVE_ARM_TWD if SMP
-	select HAVE_PATA_PLATFORM
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	help
-	  Include support for the ARM(R) RealView(R) Platform Baseboard for
-	  the ARM11MPCore.  This platform has an on-board ARM11MPCore and has
-	  support for PCI-E and Compact Flash.
-
-# ARMv6 CPU without K extensions, but does have the new exclusive ops
-config MACH_REALVIEW_PB1176
-	bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"
-	depends on ARCH_MULTI_V6
-	select ARM_GIC
-	select CPU_V6
-	select HAVE_TCM
-	select MIGHT_HAVE_CACHE_L2X0
-	help
-	  Include support for the ARM(R) RealView(R) Platform Baseboard for
-	  ARM1176JZF-S.
-
-config REALVIEW_PB1176_SECURE_FLASH
-	bool "Allow access to the secure flash memory block"
-	depends on MACH_REALVIEW_PB1176
-	default n
-	help
-	  Select this option if Linux will only run in secure mode on the
-	  RealView PB1176 platform and access to the secure flash memory
-	  block (64MB @ 0x3c000000) is required.
-
-config MACH_REALVIEW_PBA8
-	bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"
-	depends on ARCH_MULTI_V7
-	select ARM_GIC
-	select HAVE_PATA_PLATFORM
-	help
-	  Include support for the ARM(R) RealView Platform Baseboard for
-	  Cortex(tm)-A8.  This platform has an on-board Cortex-A8 and has
-	  support for PCI-E and Compact Flash.
-
-config MACH_REALVIEW_PBX
-	bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9"
-	depends on ARCH_MULTI_V7
-	select ARM_GIC
-	select HAVE_ARM_SCU if SMP
-	select HAVE_ARM_TWD if SMP
-	select HAVE_PATA_PLATFORM
-	select HAVE_SMP
-	select MIGHT_HAVE_CACHE_L2X0
-	select ZONE_DMA
-	help
-	  Include support for the ARM(R) RealView(R) Platform Baseboard
-	  Explore.
-
 config REALVIEW_HIGH_PHYS_OFFSET
 	bool "High physical base address for the RealView platform"
-	depends on MMU && !MACH_REALVIEW_PB1176
+	depends on MMU
 	default y
 	help
 	  RealView boards other than PB1176 have the RAM available at
-- 
2.7.4

[PATCH 3/5] ARM: realview: cut board options from defconfig

[Linus Walleij]

This kills off the now unused board configuration symbols for
the different RealView boards from the RealView defconfig.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/configs/realview_defconfig | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 9e77dc7b828f..7824b8bf9894 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -11,17 +11,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MULTI_V6=y
 CONFIG_ARCH_REALVIEW=y
-CONFIG_REALVIEW_DT=y
-CONFIG_MACH_REALVIEW_EB=y
-CONFIG_REALVIEW_EB_ARM1136=y
-CONFIG_REALVIEW_EB_ARM1176=y
-CONFIG_REALVIEW_EB_A9MP=y
-CONFIG_REALVIEW_EB_ARM11MP=y
-CONFIG_REALVIEW_EB_ARM11MP_REVB=y
-CONFIG_MACH_REALVIEW_PB11MP=y
-CONFIG_MACH_REALVIEW_PB1176=y
-CONFIG_MACH_REALVIEW_PBA8=y
-CONFIG_MACH_REALVIEW_PBX=y
 CONFIG_SMP=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
-- 
2.7.4

[PATCH 4/5] ARM: realview: no need to select SMP_ON_UP explicitly

[Linus Walleij]

From: Vladimir Murzin <vladimir.murzin@arm.com>

SMP_ON_UP is already defaulted to "y" and has all dependencies expressed
- no need to select it per platform level

Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-realview/Kconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index a52b35aeca86..5f194c42bbdf 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -28,7 +28,6 @@ config REALVIEW_DT
 	select POWER_RESET
 	select POWER_RESET_VERSATILE
 	select POWER_SUPPLY
-	select SMP_ON_UP if SMP
 	select SOC_REALVIEW
 	select USE_OF
 	select ZONE_DMA
-- 
2.7.4

[PATCH 5/5] ARM: realview: imply device tree boot

[Linus Walleij]

This reduces the Kconfig for the RealView by assuming we are
always booting from the device tree, and removing all the uses
of CONFIG_REALVIEW_DT and replacing with CONFIG_ARCH_REALVIEW.

Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
MTD, irqchip folks: please ACK this so we can merge the entire
cleanup series through ARM SoC.
---
 arch/arm/mach-realview/Kconfig  | 23 ++++++++---------------
 arch/arm/mach-realview/Makefile |  2 +-
 drivers/irqchip/Makefile        |  2 +-
 drivers/mtd/maps/Kconfig        |  2 +-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index 5f194c42bbdf..f25940fcbe61 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -2,22 +2,12 @@ menuconfig ARCH_REALVIEW
 	bool "ARM Ltd. RealView family"
 	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7
 	select ARM_AMBA
-	select ARM_TIMER_SP804
-	select COMMON_CLK_VERSATILE
-	select GPIO_PL061 if GPIOLIB
-	select ICST
-	select PLAT_VERSATILE
-	select PLAT_VERSATILE_SCHED_CLOCK
-	help
-	  This enables support for ARM Ltd RealView boards.
-
-if ARCH_REALVIEW
-
-config REALVIEW_DT
-	bool "Support RealView(R) Device Tree based boot"
 	select ARM_GIC
 	select CLK_SP810
+	select ARM_TIMER_SP804
+	select COMMON_CLK_VERSATILE
 	select CPU_ARM926T if ARCH_MULTI_V5
+	select GPIO_PL061 if GPIOLIB
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_PATA_PLATFORM
@@ -25,6 +15,8 @@ config REALVIEW_DT
 	select HAVE_TCM
 	select ICST
 	select MFD_SYSCON
+	select PLAT_VERSATILE
+	select PLAT_VERSATILE_SCHED_CLOCK
 	select POWER_RESET
 	select POWER_RESET_VERSATILE
 	select POWER_SUPPLY
@@ -32,8 +24,9 @@ config REALVIEW_DT
 	select USE_OF
 	select ZONE_DMA
 	help
-	  Include support for booting the ARM(R) RealView(R) evaluation
-	  boards using a device tree machine description.
+	  This enables support for ARM Ltd RealView boards.
+
+if ARCH_REALVIEW
 
 config REALVIEW_HIGH_PHYS_OFFSET
 	bool "High physical base address for the RealView platform"
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index 97dab53daaf1..6df86c29bbc3 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -4,6 +4,6 @@
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 	-I$(srctree)/arch/arm/plat-versatile/include
 
-obj-$(CONFIG_REALVIEW_DT)		+= realview-dt.o
+obj-y					+= realview-dt.o
 obj-$(CONFIG_SMP)			+= platsmp-dt.o
 obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 4c203b6b8163..92fa06e16a17 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi-nmi.o
 obj-$(CONFIG_ARCH_SPEAR3XX)		+= spear-shirq.o
 obj-$(CONFIG_ARM_GIC)			+= irq-gic.o irq-gic-common.o
 obj-$(CONFIG_ARM_GIC_PM)		+= irq-gic-pm.o
-obj-$(CONFIG_REALVIEW_DT)		+= irq-gic-realview.o
+obj-$(CONFIG_ARCH_REALVIEW)		+= irq-gic-realview.o
 obj-$(CONFIG_ARM_GIC_V2M)		+= irq-gic-v2m.o
 obj-$(CONFIG_ARM_GIC_V3)		+= irq-gic-v3.o irq-gic-common.o
 obj-$(CONFIG_ARM_GIC_V3_ITS)		+= irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 392f9eff5fb7..5bcc896a48c3 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -78,7 +78,7 @@ config MTD_PHYSMAP_OF_VERSATILE
 	bool "Support ARM Versatile physmap OF"
 	depends on MTD_PHYSMAP_OF
 	depends on MFD_SYSCON
-	default y if (ARCH_INTEGRATOR || ARCH_VERSATILE || REALVIEW_DT)
+	default y if (ARCH_INTEGRATOR || ARCH_VERSATILE || ARCH_REALVIEW)
 	help
 	  This provides some extra DT physmap parsing for the ARM Versatile
 	  platforms, basically to add a VPP (write protection) callback so
-- 
2.7.4

[PATCH 5/5] ARM: realview: imply device tree boot

[Arnd Bergmann]

On Wednesday, August 10, 2016 2:40:30 PM CEST Linus Walleij wrote:
> +         This enables support for ARM Ltd RealView boards.
> +
> +if ARCH_REALVIEW
>  
>  config REALVIEW_HIGH_PHYS_OFFSET
>         bool "High physical base address for the RealView platform"
> 

REALVIEW_HIGH_PHYS_OFFSET can be removed as well now, I think it
is completely unused after your patches.

	Arnd

[PATCH 2/5] ARM: realview: reduce the RealView Kconfig

[Arnd Bergmann]

On Wednesday, August 10, 2016 2:40:27 PM CEST Linus Walleij wrote:
> -
> -config REALVIEW_EB_ARM1136
> -       bool "Support ARM1136J(F)-S Tile"
> -       depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
> -       select CPU_V6
> -       help
> -         Enable support for the ARM1136 tile fitted to the
> -         Realview(R) Emulation Baseboard platform.
> -

You seem to lose the "select CPU_V6" here, so we end up building
realview_defconfig for ARMv6K or higher, and that won't work
on ARM1136r0 (it will work on ARM1136r1 and all other v6 based
cores).

I actually liked the idea of having per-CPU options for Realview-EB
here, but if we can find another way to select CPU_V6 when needed,
I won't complain about the removal as it does simplify things
quite a bit.

	Arnd

[PATCH 2/5] ARM: realview: reduce the RealView Kconfig

[Linus Walleij]

On Wed, Aug 10, 2016 at 2:52 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Wednesday, August 10, 2016 2:40:27 PM CEST Linus Walleij wrote:
>> -
>> -config REALVIEW_EB_ARM1136
>> -       bool "Support ARM1136J(F)-S Tile"
>> -       depends on MACH_REALVIEW_EB && ARCH_MULTI_V6
>> -       select CPU_V6
>> -       help
>> -         Enable support for the ARM1136 tile fitted to the
>> -         Realview(R) Emulation Baseboard platform.
>> -
>
> You seem to lose the "select CPU_V6" here, so we end up building
> realview_defconfig for ARMv6K or higher, and that won't work
> on ARM1136r0 (it will work on ARM1136r1 and all other v6 based
> cores).
>
> I actually liked the idea of having per-CPU options for Realview-EB
> here, but if we can find another way to select CPU_V6 when needed,
> I won't complain about the removal as it does simplify things
> quite a bit.

Hm I got too carried away with the broomstick I think.

I'm simply dropping this patch for now.

Yours,
Linus Walleij