From patchwork Fri Aug 7 01:28:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 6963831 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 60DDF9F39D for ; Fri, 7 Aug 2015 01:28:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69CD32074B for ; Fri, 7 Aug 2015 01:28:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79DB02074A for ; Fri, 7 Aug 2015 01:28:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753024AbbHGB2z (ORCPT ); Thu, 6 Aug 2015 21:28:55 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:48524 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751925AbbHGB2y (ORCPT ); Thu, 6 Aug 2015 21:28:54 -0400 Received: from reginn.isobedori.kobe.vergenet.net (p1112-ipbfp1902kobeminato.hyogo.ocn.ne.jp [114.172.120.112]) by kirsty.vergenet.net (Postfix) with ESMTPA id 524CE25B798; Fri, 7 Aug 2015 11:28:52 +1000 (AEST) Received: by reginn.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id AD0A0940495; Fri, 7 Aug 2015 10:28:47 +0900 (JST) Date: Fri, 7 Aug 2015 10:28:47 +0900 From: Simon Horman To: Olof Johansson Cc: arm@kernel.org, linux-sh@vger.kernel.org, Kevin Hilman , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Magnus Damm Subject: Re: [GIT PULL v2] Renesas ARM Based SoC Marzen Board Removal for v4.3 Message-ID: <20150807012847.GF1145@verge.net.au> References: <20150806081000.GA16520@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150806081000.GA16520@localhost> Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Aug 06, 2015 at 10:10:00AM +0200, Olof Johansson wrote: > On Mon, Aug 03, 2015 at 03:04:55PM +0900, Simon Horman wrote: > > Hi Olof, Hi Kevin, Hi Arnd, > > > > Please consider these Renesas ARM based SoC marzen board removal for v4.3. > > > > > > This series removes legacy r8a7779 SoC and marzen board code. > > It aims to do do so in a way that does not introduce feature regressions > > when when booting the r8a7779/marzen board using shmobile_defconfig, > > which provides for booting using multiplatform, a scenario which previously > > used board code to provide some features including SMP. > > > > Because of the above this series modifies SoC and DT files, > > and then removes code. And because of that it was not entirely clear to > > me which branch it should go into, so I have provided it in a stand-alone > > branch. > > > > Unfortunately this branch has a number of minor conflicts with the "Renesas > > ARM Based SoC Cleanup for v4.3", tagged as renesas-cleanup-for-v4.3, which > > you have previously pulled. > > > > A resolution to those conflicts can be found in the > > renesas-next-20150730-v4.2-rc1 tag of the renesas tree. > > > > On a more positive note, I believe this to well over 8000 lines of legacy > > code removed in this cycle :) > > > > > > Changes between v1 and v2: > > > > * As requested by Olof: Do not include defconfig updates; > > these will be handled separately > > > > > > The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754: > > > > Linux 4.2-rc1 (2015-07-05 11:01:52 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-marzen-board-removal-for-v4.3 > > Merged, but it was a messy one and it's awkward to diff with your proposed > resolution due to other differences. > > Please double-check that I resolved things correctly. Thanks! Sorry about that, it seems this has been rather messy. Unfortunately I have noticed what appear to be two merge problems. I am not sure what the best way to resolve them is, but my corrections are below. If you need formal patches please don't hesitate to ask. * The arch/arm/mach-shmobile/Makefile problem seems to break builds where ARCH_SHMOBILE_LEGACY or ARCH_SHMOBILE_MULTI are enabled. In particular the following defconfigs: multi_v7, bockw, shmobile. * The arch/arm/boot/dts/Makefile problem just causes some unnecessary dtb compilation. Which seems harmless though should be cleaned up at some point. --- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index dd2063ad194f..333e0e3466f1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -517,9 +517,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \ s5pv210-torbreck.dtb dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \ r8a7778-bockw.dtb \ - r8a7778-bockw-reference.dtb \ - r8a7779-marzen.dtb \ - sh73a0-kzm9g.dtb + r8a7778-bockw-reference.dtb dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ emev2-kzm9d.dtb \ r7s72100-genmai.dtb \ diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 8d1e0b6ac2a2..476de30798d7 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o ifndef CONFIG_ARCH_SHMOBILE_MULTI obj-$(CONFIG_MACH_BOCKW) += board-bockw.o obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o +endif # Framework support obj-$(CONFIG_SMP) += $(smp-y)