From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from exprod5og105.obsmtp.com (exprod5og105.obsmtp.com [64.18.0.180]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7DAE3B7C2B for ; Fri, 6 Nov 2009 01:51:35 +1100 (EST) Message-ID: <4AF2E6DE.7050601@gefanuc.com> Date: Thu, 05 Nov 2009 14:53:18 +0000 From: Martyn Welch MIME-Version: 1.0 To: Kumar Gala Subject: Re: [PATCH 3/5] powerpc/86xx: Enable NVRAM on GE Fanuc's SBC610 References: <20090702154928.31202.65107.stgit@ES-J7S4D2J.amer.consind.ge.com> <20090702161231.31202.87763.stgit@ES-J7S4D2J.amer.consind.ge.com> <4AF2DFC4.80307@gefanuc.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Cc: linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Kumar Gala wrote: > > On Nov 5, 2009, at 8:23 AM, Martyn Welch wrote: > >> Kumar Gala wrote: >>> >>> On Jul 2, 2009, at 11:12 AM, Martyn Welch wrote: >>> >>>> This patch enables the NVRAM found on the GE Fanuc SBC610 >>>> >>>> Signed-off-by: Martyn Welch >>>> --- >>>> >>>> arch/powerpc/boot/dts/gef_sbc610.dts | 6 ++++++ >>>> arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 ++-- >>>> arch/powerpc/platforms/86xx/Kconfig | 1 + >>>> arch/powerpc/platforms/86xx/gef_sbc610.c | 5 +++++ >>>> 4 files changed, 14 insertions(+), 2 deletions(-) >>> >>> I assume these still work w/the updates to the other patches? >>> >>> - k >> I'm just updating your tree to ensure that the patches still apply >> (and compile) cleanly. I'm fairly confident that they will. > > looks like I'm getting some defconfig merge conflicts. I'll deal with > them but will apply these after defconfig updates make it into benh's > next tree. > > - k The patches are sitting in stgit here - I noticed the offset of the defconfig changes was different, but didn't notice anything else different. I can resend if that's easier? Martyn -- Martyn Welch MEng MPhil MIET (Principal Software Engineer) T:+44(0)1327322748 GE Fanuc Intelligent Platforms Ltd, |Registered in England and Wales Tove Valley Business Park, Towcester, |(3828642) at 100 Barbirolli Square, Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB VAT:GB 927559189