* [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
@ 2017-02-09 10:18 Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 1/2] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS Geert Uytterhoeven
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2017-02-09 10:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Magnus,
This patch series completes the migration from ARCH_SHMOBILE_MULTI to
ARCH_RENESAS, which was started by commit 9b5ba0df4ea4 ("ARM: shmobile:
Introduce ARCH_RENESAS").
Thanks for applying!
Geert Uytterhoeven (2):
ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS
ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
arch/arm/boot/dts/Makefile | 38 +++++++++++++++++++-------------------
arch/arm/mach-shmobile/Kconfig | 4 ----
2 files changed, 19 insertions(+), 23 deletions(-)
--
1.9.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/2] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS
2017-02-09 10:18 [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
@ 2017-02-09 10:18 ` Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 2/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
2017-02-09 10:55 ` [PATCH 0/2] " Simon Horman
2 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2017-02-09 10:18 UTC (permalink / raw)
To: linux-arm-kernel
Commit 9b5ba0df4ea4 ("ARM: shmobile: Introduce ARCH_RENESAS") started
the migration from ARCH_SHMOBILE_MULTI to ARCH_RENESAS.
Update the Makefile to build DTBs for Renesas platforms to use the new
symbol, and move the Renesas section to preserve sort order.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/Makefile | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d1b241e3cedb4d8d..625660fcc8720de4 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -672,6 +672,25 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \
arm-realview-eb-a9mp-bbrevd.dtb \
arm-realview-pba8.dtb \
arm-realview-pbx-a9.dtb
+dtb-$(CONFIG_ARCH_RENESAS) += \
+ emev2-kzm9d.dtb \
+ r7s72100-genmai.dtb \
+ r7s72100-rskrza1.dtb \
+ r8a73a4-ape6evm.dtb \
+ r8a7740-armadillo800eva.dtb \
+ r8a7743-sk-rzg1m.dtb \
+ r8a7745-sk-rzg1e.dtb \
+ r8a7778-bockw.dtb \
+ r8a7779-marzen.dtb \
+ r8a7790-lager.dtb \
+ r8a7791-koelsch.dtb \
+ r8a7791-porter.dtb \
+ r8a7792-blanche.dtb \
+ r8a7792-wheat.dtb \
+ r8a7793-gose.dtb \
+ r8a7794-alt.dtb \
+ r8a7794-silk.dtb \
+ sh73a0-kzm9g.dtb
dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk1108-evb.dtb \
rk3036-evb.dtb \
@@ -712,25 +731,6 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
s5pv210-smdkc110.dtb \
s5pv210-smdkv210.dtb \
s5pv210-torbreck.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
- emev2-kzm9d.dtb \
- r7s72100-genmai.dtb \
- r7s72100-rskrza1.dtb \
- r8a73a4-ape6evm.dtb \
- r8a7740-armadillo800eva.dtb \
- r8a7743-sk-rzg1m.dtb \
- r8a7745-sk-rzg1e.dtb \
- r8a7778-bockw.dtb \
- r8a7779-marzen.dtb \
- r8a7790-lager.dtb \
- r8a7791-koelsch.dtb \
- r8a7791-porter.dtb \
- r8a7792-blanche.dtb \
- r8a7792-wheat.dtb \
- r8a7793-gose.dtb \
- r8a7794-alt.dtb \
- r8a7794-silk.dtb \
- sh73a0-kzm9g.dtb
dtb-$(CONFIG_ARCH_SOCFPGA) += \
socfpga_arria5_socdk.dtb \
socfpga_arria10_socdk_nand.dtb \
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
2017-02-09 10:18 [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 1/2] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS Geert Uytterhoeven
@ 2017-02-09 10:18 ` Geert Uytterhoeven
2017-02-09 10:55 ` [PATCH 0/2] " Simon Horman
2 siblings, 0 replies; 6+ messages in thread
From: Geert Uytterhoeven @ 2017-02-09 10:18 UTC (permalink / raw)
To: linux-arm-kernel
The migration from ARCH_SHMOBILE_MULTI to ARCH_RENESAS started by commit
9b5ba0df4ea4 ("ARM: shmobile: Introduce ARCH_RENESAS") has been
completed, so the ARCH_SHMOBILE_MULTI symbol can be removed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/Kconfig | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 2bb4b09f079e2e64..ce2aee1481dfb98e 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,9 +1,6 @@
config ARCH_SHMOBILE
bool
-config ARCH_SHMOBILE_MULTI
- bool
-
config PM_RMOBILE
bool
select PM
@@ -34,7 +31,6 @@ menuconfig ARCH_RENESAS
depends on ARCH_MULTI_V7 && MMU
select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
select ARCH_SHMOBILE
- select ARCH_SHMOBILE_MULTI
select ARM_GIC
select GPIOLIB
select HAVE_ARM_SCU if SMP
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
2017-02-09 10:18 [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 1/2] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 2/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
@ 2017-02-09 10:55 ` Simon Horman
2017-02-09 13:12 ` Chris Brandt
2 siblings, 1 reply; 6+ messages in thread
From: Simon Horman @ 2017-02-09 10:55 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 09, 2017 at 11:18:47AM +0100, Geert Uytterhoeven wrote:
> Hi Simon, Magnus,
>
> This patch series completes the migration from ARCH_SHMOBILE_MULTI to
> ARCH_RENESAS, which was started by commit 9b5ba0df4ea4 ("ARM: shmobile:
> Introduce ARCH_RENESAS").
>
> Thanks for applying!
Thanks, nice to see this coming to an end.
I have queued up patch 1/2 in the dt-for-v4.12 branch.
I am of a mind to defer patch 2/2 because it looks like it should
go in the soc-for-v4.12 branch and I'd rather not add a dependency
on the dt-for-v4.12 branch for a cleanup.
In a perfect world we could have one branch to rule them all;
we do not live in that world.
> Geert Uytterhoeven (2):
> ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS
> ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
>
> arch/arm/boot/dts/Makefile | 38 +++++++++++++++++++-------------------
> arch/arm/mach-shmobile/Kconfig | 4 ----
> 2 files changed, 19 insertions(+), 23 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
2017-02-09 10:55 ` [PATCH 0/2] " Simon Horman
@ 2017-02-09 13:12 ` Chris Brandt
2017-02-09 13:40 ` Simon Horman
0 siblings, 1 reply; 6+ messages in thread
From: Chris Brandt @ 2017-02-09 13:12 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon and Geert,
On Thursday, February 09, 2017, Simon Horman wrote:
> On Thu, Feb 09, 2017 at 11:18:47AM +0100, Geert Uytterhoeven wrote:
> > Hi Simon, Magnus,
> >
> > This patch series completes the migration from ARCH_SHMOBILE_MULTI to
> > ARCH_RENESAS, which was started by commit 9b5ba0df4ea4 ("ARM: shmobile:
> > Introduce ARCH_RENESAS").
> >
> > Thanks for applying!
>
> Thanks, nice to see this coming to an end.
>
> I have queued up patch 1/2 in the dt-for-v4.12 branch.
>
> I am of a mind to defer patch 2/2 because it looks like it should go in
> the soc-for-v4.12 branch and I'd rather not add a dependency on the dt-
> for-v4.12 branch for a cleanup.
>
> In a perfect world we could have one branch to rule them all; we do not
> live in that world.
Out of curiosity, when will arch/arm/mach-shmobile and arch/arm/configs/shmobile_defconfig be renamed (if ever)??
Chris
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI
2017-02-09 13:12 ` Chris Brandt
@ 2017-02-09 13:40 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2017-02-09 13:40 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 09, 2017 at 01:12:24PM +0000, Chris Brandt wrote:
> Hi Simon and Geert,
>
> On Thursday, February 09, 2017, Simon Horman wrote:
> > On Thu, Feb 09, 2017 at 11:18:47AM +0100, Geert Uytterhoeven wrote:
> > > Hi Simon, Magnus,
> > >
> > > This patch series completes the migration from ARCH_SHMOBILE_MULTI to
> > > ARCH_RENESAS, which was started by commit 9b5ba0df4ea4 ("ARM: shmobile:
> > > Introduce ARCH_RENESAS").
> > >
> > > Thanks for applying!
> >
> > Thanks, nice to see this coming to an end.
> >
> > I have queued up patch 1/2 in the dt-for-v4.12 branch.
> >
> > I am of a mind to defer patch 2/2 because it looks like it should go in
> > the soc-for-v4.12 branch and I'd rather not add a dependency on the dt-
> > for-v4.12 branch for a cleanup.
> >
> > In a perfect world we could have one branch to rule them all; we do not
> > live in that world.
>
>
> Out of curiosity, when will arch/arm/mach-shmobile and arch/arm/configs/shmobile_defconfig be renamed (if ever)??
There are no plans at this time.
I am happy to discuss a rename if there is a need for it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-09 13:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-09 10:18 [PATCH 0/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 1/2] ARM: dts: renesas: Switch from ARCH_SHMOBILE_MULTI to ARCH_RENESAS Geert Uytterhoeven
2017-02-09 10:18 ` [PATCH 2/2] ARM: shmobile: Remove ARCH_SHMOBILE_MULTI Geert Uytterhoeven
2017-02-09 10:55 ` [PATCH 0/2] " Simon Horman
2017-02-09 13:12 ` Chris Brandt
2017-02-09 13:40 ` Simon Horman
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).