From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [microblaze-uclinux] Re: [RFC PATCH 05/12] of: add common header for flattened device tree representation Date: Wed, 7 Oct 2009 07:38:27 -0600 Message-ID: References: <20091007041007.16890.62194.stgit@angua> <20091007043052.16890.15975.stgit@angua> <20091007155717.8df62c4d.sfr@canb.auug.org.au> <4ACC861A.7020506@monstr.eu> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <4ACC861A.7020506-pSz03upnqPeHXe+LvDLADg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org Cc: microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, sparclinux-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org List-Id: devicetree@vger.kernel.org On Wed, Oct 7, 2009 at 6:14 AM, Michal Simek wrote: > > > Stephen Rothwell wrote: >> Hi Grant, >> >> Just first obvious thing: >> >> On Tue, 06 Oct 2009 22:30:59 -0600 Grant Likely wrote: >>> diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/inclu= de/asm/prom.h >>> index 64e8b3a..5f461f0 100644 >>> --- a/arch/microblaze/include/asm/prom.h >>> +++ b/arch/microblaze/include/asm/prom.h >>> @@ -17,20 +17,10 @@ >>> =A0#ifndef _ASM_MICROBLAZE_PROM_H >>> =A0#define _ASM_MICROBLAZE_PROM_H >>> =A0#ifdef __KERNEL__ >>> - >>> -/* Definitions used by the flattened device tree */ >>> -#define OF_DT_HEADER =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A00xd00dfeed /* mark= er */ >> >> This is used in arch/microblaze/kernel/head.S, but you move its >> definition inside "#ifndef __ASSEMBLY__" below. =A0You should probably >> replace the include of asm/prom.h in arch/microblaze/kernel/head.S with >> linux/of_fdt.h (assuming that the comment in there is correct). > > yes, Stephen is right here. I created one patch (in attachment) which fix= ed it. I tested your > patches on Microblaze (noMMU and MMU) and I have no problem with compilat= ion and simple boot-up > works for both versions too. > > With that my patch: Acked-by: Michal Simek Thanks. I'll merge your change with my patch so that bisect isn't broken. g. -- = Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.