--- xc/config/cf/xfree86.cf.orig Fri Dec 8 18:33:46 2000 +++ xc/config/cf/xfree86.cf Fri Dec 8 18:37:00 2000 @@ -464,6 +464,88 @@ # endif #endif +/* + * For Arm platforms, the default is to build all modules which + * are supported on this platform. + */ +#ifdef Arm32Architecture +# ifndef XF86Server +# define XF86Server YES +# endif +/* 1bpp module */ +# ifndef XF1Bpp +# define XF1Bpp YES +# endif +/* 4bpp module */ +# ifndef XF4Bpp +# define XF4Bpp YES +# endif +/* 8/32bpp overlay module */ +# ifndef XF8_32Bpp +# define XF8_32Bpp YES +# endif +/* 8/16bpp dual fb module */ +# ifndef XF8_16Bpp +# define XF8_16Bpp YES +# endif +/* 24/32bpp conversion module */ +# ifndef XF24_32Bpp +# define XF24_32Bpp YES +# endif +/* shadow fb module */ +# ifndef XFShadowFB +# define XFShadowFB YES +# endif +/* vgahw module */ +# ifndef XF86VgaHw +# define XF86VgaHw YES +# endif +/* fbdevhw module */ +# ifndef XF86FBDevHw +# define XF86FBDevHw YES +# endif +/* XAA module */ +# ifndef XF86XAA +# define XF86XAA YES +# endif +/* ramdac module */ +# ifndef XF86Ramdac +# define XF86Ramdac YES +# endif +/* I2C module */ +# ifndef XF86I2C +# define XF86I2C YES +# endif +/* DDC module */ +# ifndef XF86DDC +# define XF86DDC YES +# endif +/* RAC (Resource Access Control) module */ +# ifndef XF86RAC +# define XF86RAC YES +# endif + +/* int10 module */ +# ifndef XF86Int10 +# define XF86Int10 YES +# endif + +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers ati +# else +# define DevelDrivers /* */ +# endif +# endif + +/* Pure PCI drivers should go first */ +# ifndef XF86CardDrivers +/* I have no idea which of these are correct -- Peter Maydell */ +# define XF86CardDrivers mga tdfx glint s3virge rendition \ + savage nv DevelDrivers siliconmotion vga \ + XF86OSCardDrivers XF86ExtraCardDrivers +# endif +#endif /* * For Mips/Arc platforms, the default is to build all modules which --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c.orig Sun Dec 10 16:47:50 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c Sun Dec 10 16:50:53 2000 @@ -478,7 +478,7 @@ if (iopl(3) || ioperm(0, 1024, 1)) return (FALSE); #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) #else #ifdef __GNUC__ #if defined(__ia64__) @@ -508,7 +508,7 @@ if (iopl(3) || ioperm(0, 1024, 1)) return; #endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) +#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) #else #ifdef __GNUC__ #if defined(__ia64__) --- xc/programs/Xserver/hw/xfree86/common/compiler.h.orig Sun Dec 10 16:56:40 2000 +++ xc/programs/Xserver/hw/xfree86/common/compiler.h Sun Dec 10 16:59:05 2000 @@ -1067,7 +1067,7 @@ #define mem_barrier() /* NOP */ #define write_mem_barrier() /* NOP */ -#if !defined(FAKEIT) && !defined(__mc68000__) +#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) #ifdef GCCUSESGAS /* @@ -1176,7 +1176,7 @@ #endif /* GCCUSESGAS */ -#else /* !defined(FAKEIT) && !defined(__mc68000__) */ +#else /* !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) */ static __inline__ void outb(unsigned short port, unsigned char val) --- xc/lib/Xt/Intrinsic.h.orig Sun Dec 10 17:00:50 2000 +++ xc/lib/Xt/Intrinsic.h Sun Dec 10 17:01:23 2000 @@ -2054,7 +2054,7 @@ #define XtDefaultFont "XtDefaultFont" #define XtDefaultFontSet "XtDefaultFontSet" -#if defined(CRAY) || defined(__arm) || defined(__ACK) +#if defined(CRAY) || defined(__ACK) #if __STDC__ && !defined(__ACK) #define XtOffset(p_type,field) _Offsetof(p_type,field) #else @@ -2068,7 +2068,7 @@ #endif /* !CRAY2 */ #endif /* __STDC__ */ -#else /* ! (CRAY || __arm || __ACK) */ +#else /* ! (CRAY || __ACK) */ #define XtOffset(p_type,field) \ ((Cardinal) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL))) --- xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c.orig Sun Dec 10 17:06:02 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c Sun Dec 10 23:35:28 2000 @@ -150,7 +150,7 @@ return ret; } -#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__mc68000__) +#elif defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__mc68000__) || defined(__arm__) /* XXX this isn't exactly correct but it will get the server working * for now until we get something better. --- xc/programs/Xserver/hw/xfree86/os-support/Imakefile.orig Sun Dec 10 23:36:43 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile Sun Dec 10 23:37:59 2000 @@ -13,6 +13,7 @@ #if defined(i386Architecture) || defined(ia64Architecture) || \ (defined(LinuxArchitecture) && defined(AlphaArchitecture)) || \ (defined(LinuxArchitecture) && defined(Mc68020Architecture)) || \ + (defined(LinuxArchitecture) && defined(Arm32Architecture)) || \ (defined(FreeBSDArchitecture) && defined(AlphaArchitecture)) || \ defined(PpcArchitecture) || defined(SparcArchitecture) || \ (defined(LinuxArchitecture) && defined(MipsArchitecture)) --- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Sun Dec 10 23:39:13 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h Sun Dec 10 23:39:47 2000 @@ -136,7 +136,7 @@ /* * Select architecture specific PCI init function */ -#if (defined(__powerpc__) || defined(__mips__) || defined(__mc68000__)) && defined(linux) +#if (defined(__powerpc__) || defined(__mips__) || defined(__mc68000__) || defined(__arm__)) && defined(linux) # define ARCH_PCI_INIT linuxPciInit # define INCLUDE_XF86_MAP_PCI_MEM #elif defined(__powerpc__) && defined(__OpenBSD__) --- xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Sun Dec 10 23:40:42 2000 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile Sun Dec 10 23:41:20 2000 @@ -23,7 +23,7 @@ SBUSDRVSRC = linuxSbus.c SBUSDRVOBJ = linuxSbus.o -#elif defined(LinuxArchitecture) && (defined(PpcArchitecture) || defined(MipsArchitecture) || defined(ia64Architecture) || defined(Mc68020Architecture)) +#elif defined(LinuxArchitecture) && (defined(PpcArchitecture) || defined(MipsArchitecture) || defined(ia64Architecture) || defined(Mc68020Architecture) || defined(Arm32Architecture)) XCOMM generic linux PCI driver (using /proc/bus/pci, requires kernel 2.2)