lkml.org 
[lkml]   [2008]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: linux-next: m68k build failure
    Hi all,

    On Wed, 30 Jul 2008 10:49:35 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
    >
    > Full list of relevant files:
    > include/asm-m68k/contregs.h:#include <asm-sparc/contregs.h>
    > include/asm-m68k/fbio.h:#include <asm-sparc/fbio.h>
    > include/asm-m68k/idprom.h:#include <asm-sparc/idprom.h>

    I applied the following patch to today's linux-next.

    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/

    From: Stephen Rothwell <sfr@canb.auug.org.au>
    Date: Fri, 1 Aug 2008 15:29:27 +1000
    Subject: [PATCH] m68k: some asm-sparc include files moved

    So copy their contents into the asm-m68k files.

    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    ---
    include/asm-m68k/contregs.h | 51 +++++++-
    include/asm-m68k/fbio.h | 331 ++++++++++++++++++++++++++++++++++++++++++-
    include/asm-m68k/idprom.h | 21 +++-
    3 files changed, 400 insertions(+), 3 deletions(-)

    diff --git a/include/asm-m68k/contregs.h b/include/asm-m68k/contregs.h
    index 1e233e7..d1ea750 100644
    --- a/include/asm-m68k/contregs.h
    +++ b/include/asm-m68k/contregs.h
    @@ -1,4 +1,53 @@
    #ifndef _M68K_CONTREGS_H
    #define _M68K_CONTREGS_H
    -#include <asm-sparc/contregs.h>
    +
    +/* contregs.h: Addresses of registers in the ASI_CONTROL alternate address
    + * space. These are for the mmu's context register, etc.
    + *
    + * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
    + */
    +
    +/* 3=sun3
    + 4=sun4 (as in sun4 sysmaint student book)
    + c=sun4c (according to davem) */
    +
    +#define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */
    +#define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */
    +#define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */
    +#define AC_CONTEXT 0x30000000 /* 34c current mmu-context */
    +#define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/
    +#define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */
    +#define AC_BUS_ERROR 0x60000000 /* 34 Not cleared on read, byte. */
    +#define AC_SYNC_ERR 0x60000000 /* c fault type */
    +#define AC_SYNC_VA 0x60000004 /* c fault virtual address */
    +#define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */
    +#define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */
    +#define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */
    +#define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */
    +#define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */
    +#define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */
    +#define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */
    +#define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/
    +
    +/* s=Swift, h=Ross_HyperSPARC, v=TI_Viking, t=Tsunami, r=Ross_Cypress */
    +#define AC_M_PCR 0x0000 /* shv Processor Control Reg */
    +#define AC_M_CTPR 0x0100 /* shv Context Table Pointer Reg */
    +#define AC_M_CXR 0x0200 /* shv Context Register */
    +#define AC_M_SFSR 0x0300 /* shv Synchronous Fault Status Reg */
    +#define AC_M_SFAR 0x0400 /* shv Synchronous Fault Address Reg */
    +#define AC_M_AFSR 0x0500 /* hv Asynchronous Fault Status Reg */
    +#define AC_M_AFAR 0x0600 /* hv Asynchronous Fault Address Reg */
    +#define AC_M_RESET 0x0700 /* hv Reset Reg */
    +#define AC_M_RPR 0x1000 /* hv Root Pointer Reg */
    +#define AC_M_TSUTRCR 0x1000 /* s TLB Replacement Ctrl Reg */
    +#define AC_M_IAPTP 0x1100 /* hv Instruction Access PTP */
    +#define AC_M_DAPTP 0x1200 /* hv Data Access PTP */
    +#define AC_M_ITR 0x1300 /* hv Index Tag Register */
    +#define AC_M_TRCR 0x1400 /* hv TLB Replacement Control Reg */
    +#define AC_M_SFSRX 0x1300 /* s Synch Fault Status Reg prim */
    +#define AC_M_SFARX 0x1400 /* s Synch Fault Address Reg prim */
    +#define AC_M_RPR1 0x1500 /* h Root Pointer Reg (entry 2) */
    +#define AC_M_IAPTP1 0x1600 /* h Instruction Access PTP (entry 2) */
    +#define AC_M_DAPTP1 0x1700 /* h Data Access PTP (entry 2) */
    +
    #endif /* _M68K_CONTREGS_H */
    diff --git a/include/asm-m68k/fbio.h b/include/asm-m68k/fbio.h
    index c17edf8..b9215a0 100644
    --- a/include/asm-m68k/fbio.h
    +++ b/include/asm-m68k/fbio.h
    @@ -1 +1,330 @@
    -#include <asm-sparc/fbio.h>
    +#ifndef __LINUX_FBIO_H
    +#define __LINUX_FBIO_H
    +
    +#include <linux/compiler.h>
    +#include <linux/types.h>
    +
    +/* Constants used for fbio SunOS compatibility */
    +/* (C) 1996 Miguel de Icaza */
    +
    +/* Frame buffer types */
    +#define FBTYPE_NOTYPE -1
    +#define FBTYPE_SUN1BW 0 /* mono */
    +#define FBTYPE_SUN1COLOR 1
    +#define FBTYPE_SUN2BW 2
    +#define FBTYPE_SUN2COLOR 3
    +#define FBTYPE_SUN2GP 4
    +#define FBTYPE_SUN5COLOR 5
    +#define FBTYPE_SUN3COLOR 6
    +#define FBTYPE_MEMCOLOR 7
    +#define FBTYPE_SUN4COLOR 8
    +
    +#define FBTYPE_NOTSUN1 9
    +#define FBTYPE_NOTSUN2 10
    +#define FBTYPE_NOTSUN3 11
    +
    +#define FBTYPE_SUNFAST_COLOR 12 /* cg6 */
    +#define FBTYPE_SUNROP_COLOR 13
    +#define FBTYPE_SUNFB_VIDEO 14
    +#define FBTYPE_SUNGIFB 15
    +#define FBTYPE_SUNGPLAS 16
    +#define FBTYPE_SUNGP3 17
    +#define FBTYPE_SUNGT 18
    +#define FBTYPE_SUNLEO 19 /* zx Leo card */
    +#define FBTYPE_MDICOLOR 20 /* cg14 */
    +#define FBTYPE_TCXCOLOR 21 /* SUNW,tcx card */
    +
    +#define FBTYPE_LASTPLUSONE 21 /* This is not last + 1 in fact... */
    +
    +/* Does not seem to be listed in the Sun file either */
    +#define FBTYPE_CREATOR 22
    +#define FBTYPE_PCI_IGA1682 23
    +#define FBTYPE_P9100COLOR 24
    +
    +#define FBTYPE_PCI_GENERIC 1000
    +#define FBTYPE_PCI_MACH64 1001
    +
    +/* fbio ioctls */
    +/* Returned by FBIOGTYPE */
    +struct fbtype {
    + int fb_type; /* fb type, see above */
    + int fb_height; /* pixels */
    + int fb_width; /* pixels */
    + int fb_depth;
    + int fb_cmsize; /* color map entries */
    + int fb_size; /* fb size in bytes */
    +};
    +#define FBIOGTYPE _IOR('F', 0, struct fbtype)
    +
    +struct fbcmap {
    + int index; /* first element (0 origin) */
    + int count;
    + unsigned char __user *red;
    + unsigned char __user *green;
    + unsigned char __user *blue;
    +};
    +
    +#ifdef __KERNEL__
    +#define FBIOPUTCMAP_SPARC _IOW('F', 3, struct fbcmap)
    +#define FBIOGETCMAP_SPARC _IOW('F', 4, struct fbcmap)
    +#else
    +#define FBIOPUTCMAP _IOW('F', 3, struct fbcmap)
    +#define FBIOGETCMAP _IOW('F', 4, struct fbcmap)
    +#endif
    +
    +/* # of device specific values */
    +#define FB_ATTR_NDEVSPECIFIC 8
    +/* # of possible emulations */
    +#define FB_ATTR_NEMUTYPES 4
    +
    +struct fbsattr {
    + int flags;
    + int emu_type; /* -1 if none */
    + int dev_specific[FB_ATTR_NDEVSPECIFIC];
    +};
    +
    +struct fbgattr {
    + int real_type; /* real frame buffer type */
    + int owner; /* unknown */
    + struct fbtype fbtype; /* real frame buffer fbtype */
    + struct fbsattr sattr;
    + int emu_types[FB_ATTR_NEMUTYPES]; /* supported emulations */
    +};
    +#define FBIOSATTR _IOW('F', 5, struct fbgattr) /* Unsupported: */
    +#define FBIOGATTR _IOR('F', 6, struct fbgattr) /* supported */
    +
    +#define FBIOSVIDEO _IOW('F', 7, int)
    +#define FBIOGVIDEO _IOR('F', 8, int)
    +
    +struct fbcursor {
    + short set; /* what to set, choose from the list above */
    + short enable; /* cursor on/off */
    + struct fbcurpos pos; /* cursor position */
    + struct fbcurpos hot; /* cursor hot spot */
    + struct fbcmap cmap; /* color map info */
    + struct fbcurpos size; /* cursor bit map size */
    + char __user *image; /* cursor image bits */
    + char __user *mask; /* cursor mask bits */
    +};
    +
    +/* set/get cursor attributes/shape */
    +#define FBIOSCURSOR _IOW('F', 24, struct fbcursor)
    +#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor)
    +
    +/* set/get cursor position */
    +#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos)
    +#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos)
    +
    +/* get max cursor size */
    +#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos)
    +
    +/* wid manipulation */
    +struct fb_wid_alloc {
    +#define FB_WID_SHARED_8 0
    +#define FB_WID_SHARED_24 1
    +#define FB_WID_DBL_8 2
    +#define FB_WID_DBL_24 3
    + __u32 wa_type;
    + __s32 wa_index; /* Set on return */
    + __u32 wa_count;
    +};
    +struct fb_wid_item {
    + __u32 wi_type;
    + __s32 wi_index;
    + __u32 wi_attrs;
    + __u32 wi_values[32];
    +};
    +struct fb_wid_list {
    + __u32 wl_flags;
    + __u32 wl_count;
    + struct fb_wid_item *wl_list;
    +};
    +
    +#define FBIO_WID_ALLOC _IOWR('F', 30, struct fb_wid_alloc)
    +#define FBIO_WID_FREE _IOW('F', 31, struct fb_wid_alloc)
    +#define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list)
    +#define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list)
    +
    +/* Creator ioctls */
    +#define FFB_IOCTL ('F'<<8)
    +#define FFB_SYS_INFO (FFB_IOCTL|80)
    +#define FFB_CLUTREAD (FFB_IOCTL|81)
    +#define FFB_CLUTPOST (FFB_IOCTL|82)
    +#define FFB_SETDIAGMODE (FFB_IOCTL|83)
    +#define FFB_GETMONITORID (FFB_IOCTL|84)
    +#define FFB_GETVIDEOMODE (FFB_IOCTL|85)
    +#define FFB_SETVIDEOMODE (FFB_IOCTL|86)
    +#define FFB_SETSERVER (FFB_IOCTL|87)
    +#define FFB_SETOVCTL (FFB_IOCTL|88)
    +#define FFB_GETOVCTL (FFB_IOCTL|89)
    +#define FFB_GETSAXNUM (FFB_IOCTL|90)
    +#define FFB_FBDEBUG (FFB_IOCTL|91)
    +
    +/* Cg14 ioctls */
    +#define MDI_IOCTL ('M'<<8)
    +#define MDI_RESET (MDI_IOCTL|1)
    +#define MDI_GET_CFGINFO (MDI_IOCTL|2)
    +#define MDI_SET_PIXELMODE (MDI_IOCTL|3)
    +# define MDI_32_PIX 32
    +# define MDI_16_PIX 16
    +# define MDI_8_PIX 8
    +
    +struct mdi_cfginfo {
    + int mdi_ncluts; /* Number of implemented CLUTs in this MDI */
    + int mdi_type; /* FBTYPE name */
    + int mdi_height; /* height */
    + int mdi_width; /* widht */
    + int mdi_size; /* available ram */
    + int mdi_mode; /* 8bpp, 16bpp or 32bpp */
    + int mdi_pixfreq; /* pixel clock (from PROM) */
    +};
    +
    +/* SparcLinux specific ioctl for the MDI, should be replaced for
    + * the SET_XLUT/SET_CLUTn ioctls instead
    + */
    +#define MDI_CLEAR_XLUT (MDI_IOCTL|9)
    +
    +/* leo & ffb ioctls */
    +struct fb_clut_alloc {
    + __u32 clutid; /* Set on return */
    + __u32 flag;
    + __u32 index;
    +};
    +
    +struct fb_clut {
    +#define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */
    + __u32 flag;
    + __u32 clutid;
    + __u32 offset;
    + __u32 count;
    + char * red;
    + char * green;
    + char * blue;
    +};
    +
    +struct fb_clut32 {
    + __u32 flag;
    + __u32 clutid;
    + __u32 offset;
    + __u32 count;
    + __u32 red;
    + __u32 green;
    + __u32 blue;
    +};
    +
    +#define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc)
    +#define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc)
    +#define LEO_CLUTREAD _IOW('L', 55, struct fb_clut)
    +#define LEO_CLUTPOST _IOW('L', 56, struct fb_clut)
    +#define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */
    +#define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */
    +
    +#ifdef __KERNEL__
    +/* Addresses on the fd of a cgsix that are mappable */
    +#define CG6_FBC 0x70000000
    +#define CG6_TEC 0x70001000
    +#define CG6_BTREGS 0x70002000
    +#define CG6_FHC 0x70004000
    +#define CG6_THC 0x70005000
    +#define CG6_ROM 0x70006000
    +#define CG6_RAM 0x70016000
    +#define CG6_DHC 0x80000000
    +
    +#define CG3_MMAP_OFFSET 0x4000000
    +
    +/* Addresses on the fd of a tcx that are mappable */
    +#define TCX_RAM8BIT 0x00000000
    +#define TCX_RAM24BIT 0x01000000
    +#define TCX_UNK3 0x10000000
    +#define TCX_UNK4 0x20000000
    +#define TCX_CONTROLPLANE 0x28000000
    +#define TCX_UNK6 0x30000000
    +#define TCX_UNK7 0x38000000
    +#define TCX_TEC 0x70000000
    +#define TCX_BTREGS 0x70002000
    +#define TCX_THC 0x70004000
    +#define TCX_DHC 0x70008000
    +#define TCX_ALT 0x7000a000
    +#define TCX_SYNC 0x7000e000
    +#define TCX_UNK2 0x70010000
    +
    +/* CG14 definitions */
    +
    +/* Offsets into the OBIO space: */
    +#define CG14_REGS 0 /* registers */
    +#define CG14_CURSORREGS 0x1000 /* cursor registers */
    +#define CG14_DACREGS 0x2000 /* DAC registers */
    +#define CG14_XLUT 0x3000 /* X Look Up Table -- ??? */
    +#define CG14_CLUT1 0x4000 /* Color Look Up Table */
    +#define CG14_CLUT2 0x5000 /* Color Look Up Table */
    +#define CG14_CLUT3 0x6000 /* Color Look Up Table */
    +#define CG14_AUTO 0xf000
    +
    +#endif /* KERNEL */
    +
    +/* These are exported to userland for applications to use */
    +/* Mappable offsets for the cg14: control registers */
    +#define MDI_DIRECT_MAP 0x10000000
    +#define MDI_CTLREG_MAP 0x20000000
    +#define MDI_CURSOR_MAP 0x30000000
    +#define MDI_SHDW_VRT_MAP 0x40000000
    +
    +/* Mappable offsets for the cg14: frame buffer resolutions */
    +/* 32 bits */
    +#define MDI_CHUNKY_XBGR_MAP 0x50000000
    +#define MDI_CHUNKY_BGR_MAP 0x60000000
    +
    +/* 16 bits */
    +#define MDI_PLANAR_X16_MAP 0x70000000
    +#define MDI_PLANAR_C16_MAP 0x80000000
    +
    +/* 8 bit is done as CG3 MMAP offset */
    +/* 32 bits, planar */
    +#define MDI_PLANAR_X32_MAP 0x90000000
    +#define MDI_PLANAR_B32_MAP 0xa0000000
    +#define MDI_PLANAR_G32_MAP 0xb0000000
    +#define MDI_PLANAR_R32_MAP 0xc0000000
    +
    +/* Mappable offsets on leo */
    +#define LEO_SS0_MAP 0x00000000
    +#define LEO_LC_SS0_USR_MAP 0x00800000
    +#define LEO_LD_SS0_MAP 0x00801000
    +#define LEO_LX_CURSOR_MAP 0x00802000
    +#define LEO_SS1_MAP 0x00803000
    +#define LEO_LC_SS1_USR_MAP 0x01003000
    +#define LEO_LD_SS1_MAP 0x01004000
    +#define LEO_UNK_MAP 0x01005000
    +#define LEO_LX_KRN_MAP 0x01006000
    +#define LEO_LC_SS0_KRN_MAP 0x01007000
    +#define LEO_LC_SS1_KRN_MAP 0x01008000
    +#define LEO_LD_GBL_MAP 0x01009000
    +#define LEO_UNK2_MAP 0x0100a000
    +
    +#ifdef __KERNEL__
    +struct fbcmap32 {
    + int index; /* first element (0 origin) */
    + int count;
    + u32 red;
    + u32 green;
    + u32 blue;
    +};
    +
    +#define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)
    +#define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)
    +
    +struct fbcursor32 {
    + short set; /* what to set, choose from the list above */
    + short enable; /* cursor on/off */
    + struct fbcurpos pos; /* cursor position */
    + struct fbcurpos hot; /* cursor hot spot */
    + struct fbcmap32 cmap; /* color map info */
    + struct fbcurpos size; /* cursor bit map size */
    + u32 image; /* cursor image bits */
    + u32 mask; /* cursor mask bits */
    +};
    +
    +#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
    +#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
    +#endif
    +
    +#endif /* __LINUX_FBIO_H */
    diff --git a/include/asm-m68k/idprom.h b/include/asm-m68k/idprom.h
    index 4349eaf..160616a 100644
    --- a/include/asm-m68k/idprom.h
    +++ b/include/asm-m68k/idprom.h
    @@ -1,6 +1,25 @@
    #ifndef _M68K_IDPROM_H
    #define _M68K_IDPROM_H
    -#include <asm-sparc/idprom.h>
    +/*
    + * idprom.h: Macros and defines for idprom routines
    + *
    + * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu)
    + */
    +
    +#include <linux/types.h>
    +
    +struct idprom {
    + u8 id_format; /* Format identifier (always 0x01) */
    + u8 id_machtype; /* Machine type */
    + u8 id_ethaddr[6]; /* Hardware ethernet address */
    + s32 id_date; /* Date of manufacture */
    + u32 id_sernum:24; /* Unique serial number */
    + u8 id_cksum; /* Checksum - xor of the data bytes */
    + u8 reserved[16];
    +};
    +
    +extern struct idprom *idprom;
    +extern void idprom_init(void);

    /* Sun3: in control space */
    #define SUN3_IDPROM_BASE 0x00000000
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2008-08-01 07:39    [W:0.044 / U:0.980 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site