* [GIT PULL] RealView multiplatform support
@ 2015-12-18 13:40 Linus Walleij
2015-12-18 16:05 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2015-12-18 13:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi ARM SoC people,
Here is the result of my application of the second part of Arnds
patchset, actually enabling multiplatform and getting the RealView
off the ground as a multiplatform target.
It is dependent on an outstanding patch to the irqchips tree bumping
the number of GICs to 2 for the RealView platform. I cannot say I will
be sleepless if these go in side by side: each branch will compile but
will not boot until both trees have been pulled hurting bisectability a
bit.
It is based on the top commit of the previous pull request for the
tag named realview-base-armsoc-1-tag, so it should be possible to
pull in on to of that.
Please resolve and pull this in for v4.5 if you can!
Yours,
Linus Walleij
The following changes since commit 5420b4b156179ec634d9e42279b6898b85852960:
ARM: realview: add an DT SMP boot method (2015-12-15 09:42:52 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
tags/realview-multiplatform-tag
for you to fetch changes up to 93b2d7b15af2805ae10db76c651684c5b88b1e9d:
ARM: realview: select apropriate targets (2015-12-18 14:31:00 +0100)
----------------------------------------------------------------
Multiplatform support for the RealView
- Tested on the ARM PB11MPCore
- Tested with boardfile boot
- Tested with DeviceTree boot
----------------------------------------------------------------
Arnd Bergmann (5):
ARM: realview: enable multiplatform
ARM: integrator: use explicit core module options
ARM: no longer make CPU targets visible separately
ARM: realview: make all header files local
ARM: realview: clean up header files
Linus Walleij (1):
ARM: realview: select apropriate targets
arch/arm/Kconfig | 14 ---
arch/arm/configs/realview-smp_defconfig | 9 ++
arch/arm/configs/realview_defconfig | 8 ++
arch/arm/mach-integrator/Kconfig | 132 ++++++++++++++++++---
arch/arm/mach-realview/Kconfig | 55 +++++++--
arch/arm/mach-realview/Makefile | 7 +-
.../mach-realview/{include/mach => }/board-eb.h | 4 +-
.../{include/mach => }/board-pb1176.h | 4 +-
.../{include/mach => }/board-pb11mp.h | 4 +-
.../mach-realview/{include/mach => }/board-pba8.h | 4 +-
.../mach-realview/{include/mach => }/board-pbx.h | 4 +-
arch/arm/mach-realview/core.c | 6 +-
arch/arm/mach-realview/core.h | 2 -
.../mach-realview/{include/mach => }/hardware.h | 2 -
arch/arm/mach-realview/include/mach/irqs.h | 40 -------
arch/arm/mach-realview/include/mach/uncompress.h | 77 ------------
.../arm/mach-realview/{include/mach => }/irqs-eb.h | 20 +---
.../mach-realview/{include/mach => }/irqs-pb1176.h | 23 ----
.../mach-realview/{include/mach => }/irqs-pb11mp.h | 27 +----
.../mach-realview/{include/mach => }/irqs-pba8.h | 23 ----
.../mach-realview/{include/mach => }/irqs-pbx.h | 24 +---
.../mach-realview/{include/mach => }/platform.h | 2 -
arch/arm/mach-realview/platsmp.c | 8 +-
arch/arm/mach-realview/realview-dt.c | 1 -
arch/arm/mach-realview/realview_eb.c | 6 +-
arch/arm/mach-realview/realview_pb1176.c | 6 +-
arch/arm/mach-realview/realview_pb11mp.c | 6 +-
arch/arm/mach-realview/realview_pba8.c | 6 +-
arch/arm/mach-realview/realview_pbx.c | 6 +-
arch/arm/mm/Kconfig | 30 ++---
30 files changed, 225 insertions(+), 335 deletions(-)
rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%)
rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%)
rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%)
rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%)
rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%)
rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%)
delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h
delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h
rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%)
rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (87%)
rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%)
rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%)
rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%)
rename arch/arm/mach-realview/{include/mach => }/platform.h (99%)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] RealView multiplatform support
2015-12-18 13:40 [GIT PULL] RealView multiplatform support Linus Walleij
@ 2015-12-18 16:05 ` Arnd Bergmann
2015-12-18 16:26 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2015-12-18 16:05 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 18 December 2015 14:40:33 Linus Walleij wrote:
> Hi ARM SoC people,
>
> Here is the result of my application of the second part of Arnds
> patchset, actually enabling multiplatform and getting the RealView
> off the ground as a multiplatform target.
>
> It is dependent on an outstanding patch to the irqchips tree bumping
> the number of GICs to 2 for the RealView platform. I cannot say I will
> be sleepless if these go in side by side: each branch will compile but
> will not boot until both trees have been pulled hurting bisectability a
> bit.
>
> It is based on the top commit of the previous pull request for the
> tag named realview-base-armsoc-1-tag, so it should be possible to
> pull in on to of that.
>
> Please resolve and pull this in for v4.5 if you can!
>
> Yours,
> Linus Walleij
>
> The following changes since commit 5420b4b156179ec634d9e42279b6898b85852960:
>
> ARM: realview: add an DT SMP boot method (2015-12-15 09:42:52 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git
> tags/realview-multiplatform-tag
>
> for you to fetch changes up to 93b2d7b15af2805ae10db76c651684c5b88b1e9d:
>
> ARM: realview: select apropriate targets (2015-12-18 14:31:00 +0100)
>
> ----------------------------------------------------------------
> Multiplatform support for the RealView
> - Tested on the ARM PB11MPCore
> - Tested with boardfile boot
> - Tested with DeviceTree boot
Pulled into next/multiplatform now, with part of your introduction above
added to the merge commit.
I also found a small bug that I fixed with the patch below.
Thanks for all your work on this!
Arnd
commit 3f93c644c92db1abb6149da712713132e0b37cfc
Author: Arnd Bergmann <arnd@arndb.de>
Date: Fri Dec 18 17:01:58 2015 +0100
ARM: realview: build realview-dt SMP support only when used
The platsmp-dt.c file does not build when CONFIG_SMP is disabled:
platsmp-dt.c:84:2: error: unknown field 'smp_prepare_cpus' specified in initializer
This changes the Makefile to build it conditionally on CONFIG_SMP.
The legacy platsmp.c file is only used for ATAGS based builds, so
we can move it into the CONFIG_ATAGS conditional.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile
index a4392f5..8be6632 100644
--- a/arch/arm/mach-realview/Makefile
+++ b/arch/arm/mach-realview/Makefile
@@ -5,14 +5,16 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
-I$(srctree)/arch/arm/plat-versatile/include
-obj-$(CONFIG_REALVIEW_DT) += realview-dt.o platsmp-dt.o
+obj-$(CONFIG_REALVIEW_DT) += realview-dt.o
+obj-$(CONFIG_SMP) += platsmp-dt.o
obj-y := core.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
-endif
obj-$(CONFIG_SMP) += platsmp.o
+endif
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [GIT PULL] RealView multiplatform support
2015-12-18 16:05 ` Arnd Bergmann
@ 2015-12-18 16:26 ` Linus Walleij
0 siblings, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2015-12-18 16:26 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Dec 18, 2015 at 5:05 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> Pulled into next/multiplatform now, with part of your introduction above
> added to the merge commit.
>
> I also found a small bug that I fixed with the patch below.
Ooops. Part of the rebase when cherrypicking the patches over
after testing ... couldn't test the end result of that with device
tree.
Thanks!
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-12-18 16:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-18 13:40 [GIT PULL] RealView multiplatform support Linus Walleij
2015-12-18 16:05 ` Arnd Bergmann
2015-12-18 16:26 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox