From: Tony Lindgren <tony@atomide.com>
To: Jonathan McDowell <noodles@earth.li>
Cc: linux-omap-open-source@linux.omap.com
Subject: Re: [PATCH] ARM: OMAP: Fix 1510 compilation with DSP != m
Date: Mon, 23 Oct 2006 16:16:29 +0300 [thread overview]
Message-ID: <20061023131627.GC22577@atomide.com> (raw)
In-Reply-To: <20061019151553.GX20039@earth.li>
* Jonathan McDowell <noodles@earth.li> [061019 19:17]:
> On Thu, Oct 19, 2006 at 04:32:43PM +0300, Tony Lindgren wrote:
> > * Jonathan McDowell <noodles@earth.li> [061019 00:17]:
> > > On Wed, Oct 18, 2006 at 10:32:53PM +0300, Tony Lindgren wrote:
> > > > Hi,
> > > >
> > > > * Jonathan McDowell <noodles@earth.li> [061008 22:09]:
> > > > > Looks like recent changes have broken OMAP1510 compilation; I hit this
> > > > > because I'm not using the DSP at present but during testing my fix
> > > > > discovered that setting CONFIG_OMAP_DSP to Y didn't compile either; only
> > > > > M worked. Patch below makes all 3 compile.
> > > > >
> > > > > Signed-Off-By: Jonathan McDowell <noodles@earth.li>
> > > > >
> > > > > -----
> > > > > diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
> > > > > index 992a17d..adae4f8 100644
> > > > > --- a/arch/arm/mach-omap1/devices.c
> > > > > +++ b/arch/arm/mach-omap1/devices.c
> > > > > @@ -63,7 +63,7 @@ #endif
> > > > >
> > > > > #if defined(CONFIG_OMAP_DSP)
> > > > >
> > > > > -#if defined(CONFIG_ARCH_OMAP1510)
> > > > > +#if defined(CONFIG_ARCH_OMAP15XX)
> > > > > # define OMAP1_MBOX_SIZE 0x23
> > > > > # define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
> > > > > #elif defined(CONFIG_ARCH_OMAP16XX)
> ...
> > > > I guess originally the idea was that McBSP would work even without
> > > > CONFIG_OMAP_DSP.
> > > >
> > > > Note that arch/arm/plat_omap/dsp/dsp_common.c is compiled even without
> > > > CONFIG_OMAP_DSP.
> > >
> > > dsp_common.c will always be compiled if dsp/ is entered.
> > >
> > > However arch/arm/plat-omap/dsp is only entered when CONFIG_OMAP_DSP is
> > > set; arch/arm/plat-omap/Makefile has:
> > >
> > > # DSP subsystem
> > > obj-$(CONFIG_OMAP_DSP) += dsp/ mailbox.o
> >
> > Oh yeah, that's true. Does the attached patch work for you?
>
> Confirmed as compiling and booting on the Amstrad Delta (OMAP1510) with
> CONFIG_OMAP_DSP=n.
>
> The first part of my patch (against arch/arm/mach-omap1/devices.c) is
> still needed for CONFIG_OMAP_DSP=y to compile.
OK, I've pushed that part too and tagged 2.6.18-omap1.
Tony
prev parent reply other threads:[~2006-10-23 13:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-08 19:08 [PATCH] ARM: OMAP: Fix 1510 compilation with DSP != m Jonathan McDowell
2006-10-18 19:32 ` Tony Lindgren
2006-10-18 21:10 ` Jonathan McDowell
2006-10-19 13:32 ` Tony Lindgren
2006-10-19 15:15 ` Jonathan McDowell
2006-10-23 13:16 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061023131627.GC22577@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap-open-source@linux.omap.com \
--cc=noodles@earth.li \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox