Another small problem, xc/config/xfree86.cf needs:
#define XF68FBDevPermedia2 NO for ARM. I'll attach a replacement 000a_xfree86.cf.diff patch. Cheers, - Jim --- xc/config/cf/xfree86.cf.orig Wed Sep 15 23:11:53 1999 +++ xc/config/cf/xfree86.cf Wed Sep 15 23:17:14 1999 @@ -29,37 +29,37 @@ */ #ifdef i386Architecture #ifndef XF86SVGAServer -#define XF86SVGAServer YES +#define XF86SVGAServer YES #endif #ifndef XF86VGA16Server -#define XF86VGA16Server YES +#define XF86VGA16Server YES #endif #ifndef XF86VGA16DualServer #define XF86VGA16DualServer YES #endif #ifndef XF86MonoServer -#define XF86MonoServer YES +#define XF86MonoServer YES #endif #ifndef XF86MonoDualServer #define XF86MonoDualServer YES #endif #ifndef XF86S3Server -#define XF86S3Server YES +#define XF86S3Server YES #endif #ifndef XF86S3VServer #define XF86S3VServer YES #endif #ifndef XF86I8514Server -#define XF86I8514Server YES +#define XF86I8514Server YES #endif #ifndef XF86Mach8Server -#define XF86Mach8Server YES +#define XF86Mach8Server YES #endif #ifndef XF86Mach32Server -#define XF86Mach32Server YES +#define XF86Mach32Server YES #endif #ifndef XF86Mach64Server -#define XF86Mach64Server YES +#define XF86Mach64Server YES #endif #ifndef XF86P9000Server #define XF86P9000Server YES @@ -109,6 +109,9 @@ #ifndef XF86SVGAServer #define XF86SVGAServer YES #endif +#ifndef XF86VGA16Server +#define XF86VGA16Server YES +#endif #ifndef XF86MonoServer #define XF86MonoServer YES #endif @@ -117,12 +120,15 @@ #endif #if defined(LinuxArchitecture) #ifndef XF86FBDevServer -#define XF86FBDevServer YES +#define XF86FBDevServer YES #endif #endif #ifndef XF86SvgaDrivers #define XF86SvgaDrivers mga s3v #endif +#ifndef XF86Vga16Drivers +#define XF86Vga16Drivers generic +#endif #ifndef XF86Vga2Drivers #define XF86Vga2Drivers generic #endif @@ -135,32 +141,64 @@ #ifdef Mc68020Architecture #ifndef XF68FBDevServer #define XF68FBDevServer YES +#define XF68FBDev77C32 NO +#define XF68FBDevIMSTT NO +#define XF68FBDevMach64 NO +#define XF68FBDevPermedia2 NO #endif #endif -/* +/* + * For ARM platforms, the default is to build all X servers which + * are supported on this platform. + */ +#ifdef ArmArchitecture +#ifndef XF68FBDevServer +#define XF68FBDevServer YES +#define XF68FBDevCFB8 YES +#define XF68FBDevCFB16 YES +#define XF68FBDevCFB24 YES +#define XF68FBDevCFB32 YES +#define XF68FBDevIPLAN2p2 NO +#define XF68FBDevIPLAN2p4 NO +#define XF68FBDevIPLAN2p8 NO +#define XF68FBDevILBM NO +#define XF68FBDevAFB NO +#define XF68FBDev77C32 NO +#define XF68FBDevMach64 NO +#define XF68FBDevIMSTT NO +#define XF68FBDevPermedia2 NO +#endif +#endif + +/* * For Mips/Arc platforms, the default is to build all X servers which - * are supported on this platform. + * are supported on this platform. */ #ifdef ArcArchitecture #ifndef XF86S3Server -#define XF86S3Server YES +#define XF86S3Server YES +#endif +#if defined(LinuxArchitecture) +#ifndef XF86FBDevServer +#define XF86FBDevServer YES +#endif #endif #endif -/* +/* * For PowerPC platforms, the default is to build all X servers which - * are supported on this platform. + * are supported on this platform. */ #ifdef PowerPCArchitecture #ifndef XF86SVGAServer -#define XF86SVGAServer NO +#define XF86SVGAServer NO #endif #ifndef XF86VGA16Server -#define XF86VGA16Server NO +#define XF86VGA16Server NO #endif #ifndef XF86S3Server -#define XF86S3Server NO +#define XF86S3Server NO #endif #ifndef XF68FBDevServer #define XF68FBDevServer YES @@ -174,10 +212,21 @@ #define XF68FBDevILBM NO #define XF68FBDevAFB YES #define XF68FBDev77C32 YES -#define XF68FBDevMach64 YES #define XF68FBDevIMSTT YES +#define XF68FBDevMach64 YES +#define XF68FBDevPermedia2 YES +#endif +#endif + +/* For SPARC PCI platforms, the default is to build all X servers which are + * supported on this platform. + */ +#ifdef SparcArchitecture +#ifndef XF86Mach64Server +#define XF86Mach64Server YES #endif #endif + /* * The following disables all X servers not already enabled above */ @@ -430,7 +479,7 @@ */ #ifndef XF86SvgaDrivers # ifdef AlphaArchitecture -# define XF86SvgaDrivers mga tvga8900 s3v +# define XF86SvgaDrivers mga tvga8900 s3v nv # else # if defined(LinuxArchitecture) # define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \ @@ -518,7 +567,7 @@ # define XF68FBDevCFB16 YES # endif # ifndef XF68FBDevCFB24 -# ifdef i386Architecture +# if defined(i386Architecture) || defined(AlphaArchitecture) # define XF68FBDevCFB24 YES # else # define XF68FBDevCFB24 NO @@ -531,11 +580,14 @@ # ifndef XF68FBDev77C32 # define XF68FBDev77C32 YES # endif +# ifndef XF68FBDevIMSTT +# define XF68FBDevIMSTT YES +# endif # ifndef XF68FBDevMach64 # define XF68FBDevMach64 YES # endif -# ifndef XF68FBDevIMSTT -# define XF68FBDevIMSTT YES +# ifndef XF68FBDevPermedia2 +# define XF68FBDevPermedia2 YES # endif #else # ifndef XF68FBDevIPLAN2p2 @@ -568,11 +620,14 @@ # ifndef XF68FBDev77C32 # define XF68FBDev77C32 NO # endif +# ifndef XF68FBDevIMSTT +# define XF68FBDevIMSTT NO +# endif # ifndef XF68FBDevMach64 # define XF68FBDevMach64 NO # endif -# ifndef XF68FBDevIMSTT -# define XF68FBDevIMSTT NO +# ifndef XF68FBDevPermedia2 +# define XF68FBDevPermedia2 NO # endif #endif @@ -856,7 +911,7 @@ * Build scanpci? */ #ifndef BuildScanpci -#if SystemV || SystemV4 || (defined(LinuxArchitecture) && !defined(Mc68020Architecture) && !defined(PowerPCArchitecture)) || defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || defined(OS2Architecture) +#if SystemV || SystemV4 || (defined(LinuxArchitecture) && !defined(Mc68020Architecture) && !defined(PowerPCArchitecture) && !defined(ArmArchitecture)) || defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || defined(OS2Architecture) #define BuildScanpci YES #else #define BuildScanpci NO
