From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 2 Sep 2016 16:12:09 +0000 (+0200)
Subject: Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c964cdc3694fb9b9975e1a5a098d208b1d49c885;p=linux-beck.git

Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Merge "delete the RealView boardfiles" from Linus Walleij:

This deletes the realview boardfiles, consolidates a bit
around the Kconfig options and leaves the mach-realview
directory nice and tidy, with all boards migrated over to
Device Tree.

* tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: imply device tree boot
  ARM: realview: no need to select SMP_ON_UP explicitly
  ARM: realview: delete the RealView board files
---

c964cdc3694fb9b9975e1a5a098d208b1d49c885
diff --cc arch/arm/mach-realview/Makefile
index 404882130956,6df86c29bbc3..adf39ad71cc3
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@@ -1,18 -1,9 +1,8 @@@
  #
  # Makefile for the linux kernel.
  #
 -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 -	-I$(srctree)/arch/arm/plat-versatile/include
 +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include
  
- obj-y					:= core.o
- obj-$(CONFIG_REALVIEW_DT)		+= realview-dt.o
+ obj-y					+= realview-dt.o
  obj-$(CONFIG_SMP)			+= platsmp-dt.o
- 
- ifdef CONFIG_ATAGS
- obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o
- obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o
- obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o
- obj-$(CONFIG_MACH_REALVIEW_PBA8)	+= realview_pba8.o
- obj-$(CONFIG_MACH_REALVIEW_PBX)		+= realview_pbx.o
- obj-$(CONFIG_SMP)			+= platsmp.o
- endif
  obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o