diff options
author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-19 16:26:49 +0000 |
---|---|---|
committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-19 16:26:49 +0000 |
commit | 05a40ae7e0a83588d0b45c170632517f7523cfd5 (patch) | |
tree | c6536e5f336257a94f2db8bea865b5887a0a241c | |
parent | e50f2343478966da2beb36226833110c7b6035c4 (diff) | |
download | xen-05a40ae7e0a83588d0b45c170632517f7523cfd5.tar.gz xen-05a40ae7e0a83588d0b45c170632517f7523cfd5.tar.bz2 xen-05a40ae7e0a83588d0b45c170632517f7523cfd5.zip |
bitkeeper revision 1.442 (3f6b2e49JtzRepcvZIm043BgqTyXfw)
Support building of agpgart module for XFree86
-rw-r--r-- | xenolinux-2.4.22-sparse/arch/xeno/config.in | 26 | ||||
-rw-r--r-- | xenolinux-2.4.22-sparse/arch/xeno/defconfig | 149 | ||||
-rw-r--r-- | xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c | 2 | ||||
-rwxr-xr-x | xenolinux-2.4.22-sparse/mkbuildtree | 1 |
4 files changed, 100 insertions, 78 deletions
diff --git a/xenolinux-2.4.22-sparse/arch/xeno/config.in b/xenolinux-2.4.22-sparse/arch/xeno/config.in index 67bdbb8654..c006efa744 100644 --- a/xenolinux-2.4.22-sparse/arch/xeno/config.in +++ b/xenolinux-2.4.22-sparse/arch/xeno/config.in @@ -123,32 +123,28 @@ fi dep_bool ' Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK -endmenu +#endmenu define_bool CONFIG_BLK_DEV_IDE_MODES n define_bool CONFIG_BLK_DEV_HD n +endmenu + +source drivers/char/Config.in +source fs/Config.in + mainmenu_option next_comment -comment 'Character devices' +comment 'Console drivers' bool 'Xen console support' CONFIG_XEN_CONSOLE -comment 'The options below are alpha-stage and will probably not work' -bool 'Virtual terminal' CONFIG_VT -if [ "$CONFIG_VT" = "y" ]; then - bool ' Support for console on virtual terminal' CONFIG_VT_CONSOLE - bool ' Support for VGA Video' CONFIG_VGA_CONSOLE - bool ' Support for Dummy Video (for testing)' CONFIG_DUMMY_CONSOLE - bool ' PS/2 mouse (aka "auxiliary device") support' CONFIG_PSMOUSE -fi -bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS -if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then - int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256 +if [ "$CONFIG_VT" = "y" ]; then + bool 'VGA text console' CONFIG_VGA_CONSOLE + bool 'Dummy console' CONFIG_DUMMY_CONSOLE +# bool 'Video mode selection support' CONFIG_VIDEO_SELECT fi - endmenu -source fs/Config.in mainmenu_option next_comment comment 'Kernel hacking' diff --git a/xenolinux-2.4.22-sparse/arch/xeno/defconfig b/xenolinux-2.4.22-sparse/arch/xeno/defconfig index adeac033b0..1299b483ae 100644 --- a/xenolinux-2.4.22-sparse/arch/xeno/defconfig +++ b/xenolinux-2.4.22-sparse/arch/xeno/defconfig @@ -69,6 +69,23 @@ CONFIG_PACKET_MMAP=y # CONFIG_NETLINK_DEV is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set +CONFIG_FILTER=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_IP_MULTICAST is not set +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_INET_ECN is not set +# CONFIG_SYN_COOKIES is not set + +# +# IP: Netfilter Configuration +# CONFIG_IP_NF_CONNTRACK=y CONFIG_IP_NF_FTP=y # CONFIG_IP_NF_AMANDA is not set @@ -93,11 +110,11 @@ CONFIG_IP_NF_MATCH_STATE=y CONFIG_IP_NF_MATCH_CONNTRACK=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y -CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_NAT=y -# CONFIG_IP_NF_NAT_LOCAL is not set CONFIG_IP_NF_NAT_NEEDED=y CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_REDIRECT=y +# CONFIG_IP_NF_NAT_LOCAL is not set CONFIG_IP_NF_NAT_IRC=y CONFIG_IP_NF_NAT_FTP=y CONFIG_IP_NF_NAT_TFTP=y @@ -106,19 +123,6 @@ CONFIG_IP_NF_TARGET_LOG=y CONFIG_IP_NF_TARGET_ULOG=y # CONFIG_IP_NF_TARGET_TCPMSS is not set # CONFIG_IP_NF_ARPTABLES is not set -CONFIG_FILTER=y -CONFIG_UNIX=y -CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_BOOTP is not set -# CONFIG_IP_PNP_RARP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set -# CONFIG_INET_ECN is not set -# CONFIG_SYN_COOKIES is not set # CONFIG_VLAN_8021Q is not set # @@ -130,7 +134,6 @@ CONFIG_IP_PNP_DHCP=y # # Appletalk devices # -# CONFIG_DEV_APPLETALK is not set # CONFIG_DECNET is not set # CONFIG_BRIDGE is not set @@ -147,14 +150,6 @@ CONFIG_IP_PNP_DHCP=y # # Block devices # -# CONFIG_BLK_DEV_FD is not set -# CONFIG_BLK_DEV_XD is not set -# CONFIG_PARIDE is not set -# CONFIG_BLK_CPQ_DA is not set -# CONFIG_BLK_CPQ_CISS_DA is not set -# CONFIG_CISS_SCSI_TAPE is not set -# CONFIG_BLK_DEV_DAC960 is not set -# CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y CONFIG_BLK_DEV_RAM=y @@ -166,20 +161,23 @@ CONFIG_XENOLINUX_BLOCK=y # CONFIG_BLK_DEV_HD is not set # -# Console drivers -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VIDEO_SELECT is not set -CONFIG_DUMMY_CONSOLE=y - - -# # Character devices # -CONFIG_XEN_CONSOLE=y CONFIG_VT=y CONFIG_VT_CONSOLE=y -# CONFIG_UNIX98_PTYS is not set +# CONFIG_SERIAL is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_TIPAR is not set +# CONFIG_HVC_CONSOLE is not set + +# +# I2C support +# +# CONFIG_I2C is not set # # Mice @@ -191,6 +189,52 @@ CONFIG_PSMOUSE=y # CONFIG_PC110_PAD is not set # CONFIG_MK712_MOUSE is not set +# +# Joysticks +# +# CONFIG_INPUT_GAMEPORT is not set +# CONFIG_INPUT_SERIO is not set + +# +# Joysticks +# +# CONFIG_INPUT_IFORCE_USB is not set +# CONFIG_INPUT_DB9 is not set +# CONFIG_INPUT_GAMECON is not set +# CONFIG_INPUT_TURBOGRAFX is not set +# CONFIG_QIC02_TAPE is not set +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_SCx200_GPIO is not set +# CONFIG_AMD_RNG is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_AMD_PM768 is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +CONFIG_AGP=m +CONFIG_AGP_INTEL=y +CONFIG_AGP_I810=y +CONFIG_AGP_VIA=y +CONFIG_AGP_AMD=y +CONFIG_AGP_AMD_8151=y +CONFIG_AGP_SIS=y +CONFIG_AGP_ALI=y +CONFIG_AGP_SWORKS=y +CONFIG_AGP_NVIDIA=y +# CONFIG_DRM is not set +# CONFIG_MWAVE is not set # # File systems @@ -199,15 +243,6 @@ CONFIG_PSMOUSE=y CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y # CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_ADFS_FS is not set -# CONFIG_ADFS_FS_RW is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BEFS_DEBUG is not set -# CONFIG_BFS_FS is not set CONFIG_EXT3_FS=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set @@ -215,7 +250,6 @@ CONFIG_FAT_FS=y CONFIG_MSDOS_FS=y CONFIG_UMSDOS_FS=y CONFIG_VFAT_FS=y -# CONFIG_EFS_FS is not set # CONFIG_JFFS_FS is not set # CONFIG_JFFS2_FS is not set # CONFIG_CRAMFS is not set @@ -225,52 +259,33 @@ CONFIG_ISO9660_FS=y CONFIG_JOLIET=y CONFIG_ZISOFS=y # CONFIG_JFS_FS is not set -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set # CONFIG_MINIX_FS is not set # CONFIG_VXFS_FS is not set # CONFIG_NTFS_FS is not set -# CONFIG_NTFS_RW is not set # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y -# CONFIG_DEVFS_FS is not set -# CONFIG_DEVFS_MOUNT is not set -# CONFIG_DEVFS_DEBUG is not set # CONFIG_DEVPTS_FS is not set # CONFIG_QNX4FS_FS is not set -# CONFIG_QNX4FS_RW is not set # CONFIG_ROMFS_FS is not set CONFIG_EXT2_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UDF_FS is not set -# CONFIG_UDF_RW is not set # CONFIG_UFS_FS is not set -# CONFIG_UFS_FS_WRITE is not set # # Network File Systems # # CONFIG_CODA_FS is not set -# CONFIG_INTERMEZZO_FS is not set CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_NFSD_V3=y -# CONFIG_NFSD_TCP is not set CONFIG_SUNRPC=y CONFIG_LOCKD=y CONFIG_LOCKD_V4=y # CONFIG_SMB_FS is not set # CONFIG_NCP_FS is not set -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set CONFIG_ZISOFS_FS=y # @@ -338,6 +353,13 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_UTF8 is not set # +# Console drivers +# +CONFIG_XEN_CONSOLE=y +CONFIG_VGA_CONSOLE=y +CONFIG_DUMMY_CONSOLE=y + +# # Kernel hacking # CONFIG_DEBUG_KERNEL=y @@ -349,6 +371,7 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_KALLSYMS=y # CONFIG_FRAME_POINTER is not set + # # ACPI Support # diff --git a/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c b/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c index ba492ed80d..06673f253d 100644 --- a/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c +++ b/xenolinux-2.4.22-sparse/arch/xeno/kernel/i386_ksyms.c @@ -56,6 +56,8 @@ EXPORT_SYMBOL(boot_cpu_data); EXPORT_SYMBOL(dump_thread); EXPORT_SYMBOL(dump_fpu); EXPORT_SYMBOL(dump_extended_fpu); +EXPORT_SYMBOL(__ioremap); +EXPORT_SYMBOL(iounmap); EXPORT_SYMBOL(enable_irq); EXPORT_SYMBOL(disable_irq); EXPORT_SYMBOL(disable_irq_nosync); diff --git a/xenolinux-2.4.22-sparse/mkbuildtree b/xenolinux-2.4.22-sparse/mkbuildtree index 0d5581af75..0200e2b59d 100755 --- a/xenolinux-2.4.22-sparse/mkbuildtree +++ b/xenolinux-2.4.22-sparse/mkbuildtree @@ -135,6 +135,7 @@ ln -sf ../asm-i386/mtrr.h ln -sf ../asm-i386/namei.h ln -sf ../asm-i386/param.h ln -sf ../asm-i386/parport.h +ln -sf ../asm-i386/pci.h ln -sf ../asm-i386/pgtable-3level.h ln -sf ../asm-i386/poll.h ln -sf ../asm-i386/posix_types.h |