From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 24 Nov 2011 08:23:42 +0000
Subject: Re: [PATCH] ARM: Kota2 mach-type update fix
Message-Id: <20111124082342.GD32112@linux-sh.org>
List-Id: <linux-sh.vger.kernel.org>
References: <20111122060857.23951.50598.sendpatchset@w520>
 <20111122092615.GA26411@linux-sh.org>
 <CANqRtoTvMpivHN0tZVTEY6SfkBrNLpu=rkRXUXKJG4J0UNCzhg@mail.gmail.com>
In-Reply-To: <CANqRtoTvMpivHN0tZVTEY6SfkBrNLpu=rkRXUXKJG4J0UNCzhg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-arm-kernel@lists.infradead.org

On Tue, Nov 22, 2011 at 08:41:57PM +0900, Magnus Damm wrote:
> On Tue, Nov 22, 2011 at 6:26 PM, Paul Mundt <lethal@linux-sh.org> wrote:
> > On Tue, Nov 22, 2011 at 03:08:57PM +0900, Magnus Damm wrote:
> >> From: Magnus Damm <damm@opensource.se>
> >>
> >> This patch adds kota2 to the in-kernel ARM mach-type file.
> >>
> >> Basic board support is included in 3.2-rc and the mach-type
> >> has been registered in the ARM machine repository as
> >>
> >> 3616 Renesas SH-Mobile kota2.x Board kota2 Yusuke Goda mainlined
> >>
> >> The file arch/arm/tools/mach-types is however missing Kota2
> >> which makes build of sh73a0 based boards fail with:
> >>
> >> arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count':
> >> arch/arm/mach-shmobile/platsmp.c:28:2: error: implicit declaration of function 'machine_is_kota2'
> >> make[1]: *** [arch/arm/mach-shmobile/platsmp.o] Error 1
> >>
> >> arch/arm/mach-shmobile/board-kota2.c:448:136: error: 'MACH_TYPE_KOTA2' undeclared here (not in a function)
> >> make[1]: *** [arch/arm/mach-shmobile/board-kota2.o] Error 1
> >> make: *** [arch/arm/mach-shmobile] Error 2
> >>
> >> Signed-off-by: Magnus Damm <damm@opensource.se>
> >> ---
> >>
> >> ?I propose that Paul Mundt merges this patch together with other
> >> ?SH-Mobile ARM related fixes.
> >>
> > Err, no. I'm not patching machine-generated files which precisely say not
> > to patch them at the top of the file. If there is a missing definition
> > for an upstream board then the file needs to be regenerated with the new
> > definitions, plain and simple.
> 
> Following the comment sure sounds like a good idea, but according to
> the git logs people seem to update the file:
> 
> 1d08fd9 Update Nook Color machine 3284 to common Encore name
> 
> Russell, do you mind if we update the mach-type file to include Kota2?
> It's already registered via the web interface.
> 
I'll add it with Russell's Acked-by, otherwise we'll simply have to wait
for the next batch of mach-types updates.