From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932342AbcFCIz2 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 3 Jun 2016 04:55:28 -0400
Received: from mout.kundenserver.de ([217.72.192.75]:53788 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932263AbcFCIzX (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 3 Jun 2016 04:55:23 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org,
        Mark Rutland <mark.rutland@arm.com>,
        "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" 
	<devicetree@vger.kernel.org>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Scott Branden <sbranden@broadcom.com>, Pawel Moll <pawel.moll@arm.com>,
        Ian Campbell <ijc+devicetree@hellion.org.uk>,
        Ray Jui <rjui@broadcom.com>, Will Deacon <will.deacon@arm.com>,
        Russell King <linux@armlinux.org.uk>,
        open list <linux-kernel@vger.kernel.org>,
        Eric Anholt <eric@anholt.net>, Rob Herring <robh+dt@kernel.org>,
        "open list:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." 
	<bcm-kernel-feedback-list@broadcom.com>,
        Kumar Gala <galak@codeaurora.org>
Subject: Re: [PATCH v2 7/9] ARM: bcm2835: Add devicetree for the Raspberry Pi 3.
Date: Fri, 03 Jun 2016 10:55:17 +0200
Message-ID: <3885625.kWfxlR3OJi@wuerfel>
User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; )
In-Reply-To: <1464943546.24775.131.camel@redhat.com>
References: <1464934708-24769-1-git-send-email-kraxel@redhat.com> <5490184.9quKRk1Imx@wuerfel> <1464943546.24775.131.camel@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:yfq+teRmOn1tx1uo2kMzUFzi90aymFK8UkGE31CCv2YY86eFAmE
 P27md2T6+/pm2xu5Z1vjryL4EtIWYOZERdSc03dhh9qdk7TjO6ZAKvXNkaXxo56FV0KkntW
 CKEquJRZbZP/cfvJ99LsolletD921fc+qsvMWgNfSiH1XuBJN0lhIaiTGj8gzq/1qafupM9
 ix8KiKD3dfODY47ZCBaqg==
X-UI-Out-Filterresults: notjunk:1;V01:K0:Zh78I5lCz90=:HCOly1xCg7108J0klyRNZB
 CG/gAUdNdQRLnK8K4pEx/XpbVQKy5/VIhXyGn3852+o0ctk8ADkKM2IOiaRrlab1/08vTREaB
 iSg7d23drOfhTMuBAB8fMO/YmFCm4Ntfmee5KCg7oYJV2EVewO+fmYueORUic2shgCZZNS6Im
 FwnvBdYfa4E04raEUtwvMGSnKSXfsdU3U5Q1ablYyoB3VhHS6cvN50cE1KYzb3SC3BK5OjjKW
 FFsAxs6Xv52BeV2OSUP9RUrhLePN8gYU+KWrt4cIpGT1L3+jxMb60sWqVb6nxOfwBg6ojCibH
 Q/hou/n1PD+pUYRiZZlnNFOQ139Xhq5qOWII3nhW5wZ8Nggf9CniLsJ/zZfS0YyC2Be/5azRN
 LvX+46f/1GWr8A69xInXmzh5HjhsasZvPr/82RwD5XnVasYiq650vFl3imn2oMGc9BkpbOYpW
 H4Fx2+xE7THODLkjE5r2LCN75of9NxhEPb2Hv/Da+zQRTjaygfi2pciyaVcSvlGHDuTgRUkNT
 DLSRzOF/j/QM25ZkBqApr8aB1DM/U0OeyIQg8Kdep690CrwQQKrMh0Fcmr22bTfbZiOtr5Doy
 5qUKRseoTXgC0IEs/yonfEcR+2hoJRXu8z8OYd/APFBW8uSSzbFusLvH1J/pnfVMJLl0C+yGM
 A8mSmxkeQeoutGjIqfCAoO6lKlMZj9MpkUH+LbOQaAXvcILJ7VpEy8jd+jBOeTqflJfrhUM2O
 CCMIjz6JeiCNeE93
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Friday, June 3, 2016 10:45:46 AM CEST Gerd Hoffmann wrote:
> On Fr, 2016-06-03 at 09:38 +0200, Arnd Bergmann wrote:
> > On Friday, June 3, 2016 8:18:26 AM CEST Gerd Hoffmann wrote:
> > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > > index 06b6c2d..71e2d36 100644
> > > --- a/arch/arm/boot/dts/Makefile
> > > +++ b/arch/arm/boot/dts/Makefile
> > > @@ -66,7 +66,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
> > >         bcm2835-rpi-b-rev2.dtb \
> > >         bcm2835-rpi-b-plus.dtb \
> > >         bcm2835-rpi-a-plus.dtb \
> > > -       bcm2836-rpi-2-b.dtb
> > > +       bcm2836-rpi-2-b.dtb \
> > > +       ../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb
> > >  dtb-$(CONFIG_ARCH_BCM_5301X) += \
> > >         bcm4708-asus-rt-ac56u.dtb \
> > >         bcm4708-asus-rt-ac68u.dtb \
> > 
> > Let's make this hunk a separate patch so we can discuss it on its
> > own.
> 
> Hmm, I through we where in agreement to do it this way ...

I think it's ok in principle, this is about the specific syntax.

> > I'm not really happy about the way it looks (in general, using ../../../
> > anywhere in the kernel looks hacky.
> > 
> > How about a separate
> > 
> > dtb-$(CONFIG_ARCH_BCM2835) +=
> >       ../../../arm64/boot/dts/broadcom/
> 
> Not working.
> 
> Tried "subdir-$(CONFIG_ARCH_BCM) += ...".  Didn't work either.
> Same for "dts-dirs += ...".
> 
> Running out of ideas.  Guess I have to leave this to someone who knows
> kbuild better than me.

I tried

subdir-y += ../../../arm64/boot/dts/broadcom

and it seemed to work fine, I got

  DTC     arch/arm/boot/dts/../../../arm64/boot/dts/broadcom/ns2-svk.dtb

in an allmodconfig build, which also includes CONFIG_ARCH_BCM_IPROC.

	Arnd