lkml.org 
[lkml]   [2008]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/5] [RFC][PPC] Use DCR for arch ppc, and enable MMIO and NATIVE for virtex.
    Date
    Generally speaking, I'm not sure about the validity of this patch.  In
    particular:

    1) I'm not sure what architecture code relies on including
    dcr support through ibm4xx.h.

    2) I'm not sure how temporary the ifdef in
    arch/powerpc/sysdev/Makefile really is. Is it still needed or not?

    However, this appears to work at least for the Virtex systems I've
    tried. In any event, I don't expect this to actually be sent to
    mainline, since it's ARCH=ppc related, at least not in this form.

    Unfortunately, the framebuffer driver won't work under ARCH=ppc
    without this patch.
    ---
    arch/powerpc/sysdev/Makefile | 2 --
    arch/ppc/Kconfig | 6 +++++-
    arch/ppc/platforms/4xx/Kconfig | 2 ++
    include/asm-ppc/ibm4xx.h | 1 -
    4 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
    index 15f3e85..c85525b 100644
    --- a/arch/powerpc/sysdev/Makefile
    +++ b/arch/powerpc/sysdev/Makefile
    @@ -35,10 +35,8 @@ endif
    endif

    # Temporary hack until we have migrated to asm-powerpc
    -ifeq ($(ARCH),powerpc)
    obj-$(CONFIG_CPM) += cpm_common.o
    obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
    obj-$(CONFIG_PPC_DCR) += dcr.o
    obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
    obj-$(CONFIG_UCODE_PATCH) += micropatch.o
    -endif
    diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
    index abc877f..81d6748 100644
    --- a/arch/ppc/Kconfig
    +++ b/arch/ppc/Kconfig
    @@ -116,9 +116,13 @@ config PPC_DCR_NATIVE
    bool
    default n

    +config PPC_DCR_MMIO
    + bool
    + default n
    +
    config PPC_DCR
    bool
    - depends on PPC_DCR_NATIVE
    + depends on PPC_DCR_NATIVE || PPC_DCR_MMIO
    default y

    config PTE_64BIT
    diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig
    index 76551b6..0430fc2 100644
    --- a/arch/ppc/platforms/4xx/Kconfig
    +++ b/arch/ppc/platforms/4xx/Kconfig
    @@ -228,6 +228,8 @@ config XILINX_VIRTEX_4_FX

    config XILINX_VIRTEX
    bool
    + select PPC_DCR_NATIVE
    + select PPC_DCR_MMIO

    config STB03xxx
    bool
    diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h
    index ed6891a..053a86b 100644
    --- a/include/asm-ppc/ibm4xx.h
    +++ b/include/asm-ppc/ibm4xx.h
    @@ -15,7 +15,6 @@
    #define __ASM_IBM4XX_H__

    #include <asm/types.h>
    -#include <asm/dcr.h>

    #ifdef CONFIG_40x

    --
    1.5.3.4-dirty



    \
     
     \ /
      Last update: 2008-03-28 17:25    [W:0.024 / U:1.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site