lkml.org 
[lkml]   [2012]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/9] arm/omap: enable building omap2 without omap2420/2430
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    Kconfig allows selecting CONFIG_OMAP2 but no specific SOC, the options
    being omap2420 and omap2430, but that leads to a build error when
    omap3 or omap4 are also enabled and the MULTI_OMAP2 symbol is
    undefined.

    This adds another clause to plat/multi.h, mainly to allow all
    possible randconfig combinations to build cleanly.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/plat-omap/include/plat/multi.h | 5 +++++
    1 files changed, 5 insertions(+), 0 deletions(-)
    diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h
    index 999ffba..fb7f196 100644
    --- a/arch/arm/plat-omap/include/plat/multi.h
    +++ b/arch/arm/plat-omap/include/plat/multi.h
    @@ -82,6 +82,11 @@
    # define OMAP_NAME omap2430
    # endif
    #endif
    +#ifdef CONFIG_ARCH_OMAP2
    +# ifndef OMAP_NAME
    +# define OMAP_NAME omap2
    +# endif
    +#endif
    #ifdef CONFIG_ARCH_OMAP3
    # ifdef OMAP_NAME
    # undef MULTI_OMAP2
    --
    1.7.5.4


    \
     
     \ /
      Last update: 2012-03-23 18:19    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean