* Daniel Walker <dwalker@xxxxxxxxxx> [080118 09:37]:
>
> On Fri, 2008-01-18 at 09:25 -0800, Tony Lindgren wrote:
> > * Daniel Walker <dwalker@xxxxxxxxxx> [080118 09:05]:
> > >
> > > On Fri, 2008-01-18 at 08:41 -0800, Tony Lindgren wrote:
> > > > Regarding merging core omap stuff to mainline kernel, we still need
> > > > to clean up few things to get arch/arm/*omap directories in sync with
> > > > mainline. After currently pending patches arch/arm/mach-omap1 and
> > > > plat-omap will be within one or two more main releases away from
> > > > being in sync, and mach-omap2 will take a bit longer. So hopefully
> > > > we'll be in sync with mainline for core omap stuff during this year.
> > >
> > > Do you have a 2.6.25 queue? I found the following compile error in
> > > mainline 2.6.24-rc8-git1
> >
> > Yeah, it's the omap-fixes branch.
> >
> > In general, we should feed all the fixes we can during the release
> > cycle, so let's get more active on that part too.
>
> Would you consider checkpatch.pl cleanups in that catagory?
Well I guess it depends. Any bigger clean-up patches would be better
done after we're in sync with mainline. But anything that can be
justified as a fix and does not generate extra noise sure.
> > > CC arch/arm/mach-omap1/board-nokia770.o
> > > arch/arm/mach-omap1/board-nokia770.c:40:41: error: ../plat-omap/dsp/dsp_common.h: No such file or directory
> > > arch/arm/mach-omap1/board-nokia770.c: In function ‘omap_nokia770_init’:
> > > arch/arm/mach-omap1/board-nokia770.c:335: error: implicit declaration of function ‘omap_dsp_init’
> > >
> > > This is with the "Nokia 770" option enabled .. If there's a fix for this
> > > it might be nice to have it in 2.6.25 ..
> >
> > That should be now just #include <asm/arch/dsp_common.h>.
> > Can you check if that's enough to fix it?
>
> I tried and it needed an additional ifdef. The following patch against
> mainline omap fixed it,
>
> Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
>
> diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
> index 22db19a..3ca2825 100644
> --- a/arch/arm/mach-omap1/board-nokia770.c
> +++ b/arch/arm/mach-omap1/board-nokia770.c
> @@ -36,7 +36,7 @@
> #include <asm/arch/omapfb.h>
> #include <asm/arch/lcd_mipid.h>
>
> -#include "../plat-omap/dsp/dsp_common.h"
> +#include <asm/arch/dsp_common.h>
>
> #define ADS7846_PENDOWN_GPIO 15
>
> @@ -331,7 +331,9 @@ static void __init omap_nokia770_init(void)
> omap_board_config_size = ARRAY_SIZE(nokia770_config);
> omap_gpio_init();
> omap_serial_init();
> +#ifdef CONFIG_OMAP_DSP
> omap_dsp_init();
> +#endif
> ads7846_dev_init();
> mipid_dev_init();
> }
Thanks, looks like the old include is still in the omap1-branch too, here's
a modified version of the patch to fix it there and avoid the extra
ifdef.
Tony
Subject: ARM: OMAP1: Fix compile for board-nokia770
From: Daniel Walker <dwalker@xxxxxxxxxx>
Fix compile for board-nokia770
Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -36,8 +36,6 @@
#include <asm/arch/omapfb.h>
#include <asm/arch/lcd_mipid.h>
-#include "../plat-omap/dsp/dsp_common.h"
-
#define ADS7846_PENDOWN_GPIO 15
static void __init omap_nokia770_init_irq(void)
@@ -318,6 +316,8 @@ static __init int omap_dsp_init(void)
out:
return ret;
}
+#else
+#define omap_dsp_init() do {} while (0)
#endif /* CONFIG_OMAP_DSP */
static void __init omap_nokia770_init(void)
