ia64/xen-unstable
changeset 9709:14f6d138c61d
Allow PCI-E and PCMCIA config on 64-bit Xenlinux.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
author | kaf24@firebug.cl.cam.ac.uk |
---|---|
date | Thu Apr 13 15:15:56 2006 +0100 (2006-04-13) |
parents | 2a7a46dd3bd6 |
children | e7d769001b4b |
files | buildconfigs/linux-defconfig_xen0_x86_64 buildconfigs/linux-defconfig_xenU_x86_64 buildconfigs/linux-defconfig_xen_x86_64 linux-2.6-xen-sparse/arch/x86_64/Kconfig |
line diff
1.1 --- a/buildconfigs/linux-defconfig_xen0_x86_64 Thu Apr 13 11:26:01 2006 +0100 1.2 +++ b/buildconfigs/linux-defconfig_xen0_x86_64 Thu Apr 13 15:15:56 2006 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # 1.5 # Automatically generated make config: don't edit 1.6 -# Linux kernel version: 2.6.16-rc3-xen0 1.7 -# Mon Feb 20 11:37:43 2006 1.8 +# Linux kernel version: 2.6.16-xen0 1.9 +# Thu Apr 13 14:58:29 2006 1.10 # 1.11 CONFIG_X86_64=y 1.12 CONFIG_64BIT=y 1.13 @@ -99,6 +99,8 @@ CONFIG_X86_PC=y 1.14 # CONFIG_MPSC is not set 1.15 CONFIG_GENERIC_CPU=y 1.16 CONFIG_X86_64_XEN=y 1.17 +CONFIG_X86_NO_TSS=y 1.18 +CONFIG_X86_NO_IDT=y 1.19 CONFIG_X86_L1_CACHE_BYTES=128 1.20 CONFIG_X86_L1_CACHE_SHIFT=7 1.21 CONFIG_X86_GOOD_APIC=y 1.22 @@ -176,6 +178,19 @@ CONFIG_PCI_DIRECT=y 1.23 CONFIG_XEN_PCIDEV_FRONTEND=y 1.24 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set 1.25 # CONFIG_UNORDERED_IO is not set 1.26 +# CONFIG_PCIEPORTBUS is not set 1.27 +CONFIG_PCI_LEGACY_PROC=y 1.28 +# CONFIG_PCI_DEBUG is not set 1.29 + 1.30 +# 1.31 +# PCCARD (PCMCIA/CardBus) support 1.32 +# 1.33 +# CONFIG_PCCARD is not set 1.34 + 1.35 +# 1.36 +# PCI Hotplug Support 1.37 +# 1.38 +# CONFIG_HOTPLUG_PCI is not set 1.39 1.40 # 1.41 # Executable file formats / Emulations 1.42 @@ -1001,11 +1016,7 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y 1.43 CONFIG_INFINIBAND_SRP=y 1.44 1.45 # 1.46 -# SN Devices 1.47 -# 1.48 - 1.49 -# 1.50 -# EDAC - error detection and reporting (RAS) 1.51 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1.52 # 1.53 # CONFIG_EDAC is not set 1.54 1.55 @@ -1239,7 +1250,7 @@ CONFIG_CRYPTO_CRC32C=m 1.56 # Hardware crypto devices 1.57 # 1.58 CONFIG_XEN=y 1.59 -CONFIG_NO_IDLE_HZ=y 1.60 +CONFIG_XEN_INTERFACE_VERSION=0x00030101 1.61 1.62 # 1.63 # XEN 1.64 @@ -1266,6 +1277,7 @@ CONFIG_XEN_DISABLE_SERIAL=y 1.65 CONFIG_XEN_SYSFS=y 1.66 CONFIG_HAVE_ARCH_ALLOC_SKB=y 1.67 CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y 1.68 +CONFIG_NO_IDLE_HZ=y 1.69 1.70 # 1.71 # Library routines
2.1 --- a/buildconfigs/linux-defconfig_xenU_x86_64 Thu Apr 13 11:26:01 2006 +0100 2.2 +++ b/buildconfigs/linux-defconfig_xenU_x86_64 Thu Apr 13 15:15:56 2006 +0100 2.3 @@ -1,7 +1,7 @@ 2.4 # 2.5 # Automatically generated make config: don't edit 2.6 -# Linux kernel version: 2.6.16-rc3-xen0 2.7 -# Thu Feb 16 22:56:02 2006 2.8 +# Linux kernel version: 2.6.16-xenU 2.9 +# Thu Apr 13 14:59:16 2006 2.10 # 2.11 CONFIG_X86_64=y 2.12 CONFIG_64BIT=y 2.13 @@ -103,6 +103,8 @@ CONFIG_X86_PC=y 2.14 CONFIG_MPSC=y 2.15 # CONFIG_GENERIC_CPU is not set 2.16 CONFIG_X86_64_XEN=y 2.17 +CONFIG_X86_NO_TSS=y 2.18 +CONFIG_X86_NO_IDT=y 2.19 CONFIG_X86_L1_CACHE_BYTES=128 2.20 CONFIG_X86_L1_CACHE_SHIFT=7 2.21 CONFIG_X86_GOOD_APIC=y 2.22 @@ -147,6 +149,15 @@ CONFIG_GENERIC_PENDING_IRQ=y 2.23 # CONFIG_UNORDERED_IO is not set 2.24 2.25 # 2.26 +# PCCARD (PCMCIA/CardBus) support 2.27 +# 2.28 +# CONFIG_PCCARD is not set 2.29 + 2.30 +# 2.31 +# PCI Hotplug Support 2.32 +# 2.33 + 2.34 +# 2.35 # Executable file formats / Emulations 2.36 # 2.37 CONFIG_BINFMT_ELF=y 2.38 @@ -844,11 +855,7 @@ CONFIG_DUMMY_CONSOLE=y 2.39 # 2.40 2.41 # 2.42 -# SN Devices 2.43 -# 2.44 - 2.45 -# 2.46 -# EDAC - error detection and reporting (RAS) 2.47 +# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 2.48 # 2.49 # CONFIG_EDAC is not set 2.50 2.51 @@ -1128,7 +1135,7 @@ CONFIG_CRYPTO_CRC32C=m 2.52 # Hardware crypto devices 2.53 # 2.54 CONFIG_XEN=y 2.55 -CONFIG_NO_IDLE_HZ=y 2.56 +CONFIG_XEN_INTERFACE_VERSION=0x00030101 2.57 2.58 # 2.59 # XEN 2.60 @@ -1144,6 +1151,7 @@ CONFIG_XEN_DISABLE_SERIAL=y 2.61 CONFIG_XEN_SYSFS=y 2.62 CONFIG_HAVE_ARCH_ALLOC_SKB=y 2.63 CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y 2.64 +CONFIG_NO_IDLE_HZ=y 2.65 2.66 # 2.67 # Library routines
3.1 --- a/buildconfigs/linux-defconfig_xen_x86_64 Thu Apr 13 11:26:01 2006 +0100 3.2 +++ b/buildconfigs/linux-defconfig_xen_x86_64 Thu Apr 13 15:15:56 2006 +0100 3.3 @@ -1,7 +1,7 @@ 3.4 # 3.5 # Automatically generated make config: don't edit 3.6 # Linux kernel version: 2.6.16-xen 3.7 -# Mon Mar 27 09:43:44 2006 3.8 +# Thu Apr 13 15:01:04 2006 3.9 # 3.10 CONFIG_X86_64=y 3.11 CONFIG_64BIT=y 3.12 @@ -186,6 +186,41 @@ CONFIG_PCI_DIRECT=y 3.13 CONFIG_XEN_PCIDEV_FRONTEND=y 3.14 # CONFIG_XEN_PCIDEV_FE_DEBUG is not set 3.15 # CONFIG_UNORDERED_IO is not set 3.16 +# CONFIG_PCIEPORTBUS is not set 3.17 +# CONFIG_PCI_LEGACY_PROC is not set 3.18 +# CONFIG_PCI_DEBUG is not set 3.19 + 3.20 +# 3.21 +# PCCARD (PCMCIA/CardBus) support 3.22 +# 3.23 +CONFIG_PCCARD=m 3.24 +# CONFIG_PCMCIA_DEBUG is not set 3.25 +CONFIG_PCMCIA=m 3.26 +CONFIG_PCMCIA_LOAD_CIS=y 3.27 +CONFIG_PCMCIA_IOCTL=y 3.28 +CONFIG_CARDBUS=y 3.29 + 3.30 +# 3.31 +# PC-card bridges 3.32 +# 3.33 +CONFIG_YENTA=m 3.34 +CONFIG_YENTA_O2=y 3.35 +CONFIG_YENTA_RICOH=y 3.36 +CONFIG_YENTA_TI=y 3.37 +CONFIG_YENTA_ENE_TUNE=y 3.38 +CONFIG_YENTA_TOSHIBA=y 3.39 +CONFIG_PD6729=m 3.40 +CONFIG_I82092=m 3.41 +CONFIG_PCCARD_NONSTATIC=m 3.42 + 3.43 +# 3.44 +# PCI Hotplug Support 3.45 +# 3.46 +CONFIG_HOTPLUG_PCI=m 3.47 +# CONFIG_HOTPLUG_PCI_FAKE is not set 3.48 +# CONFIG_HOTPLUG_PCI_ACPI is not set 3.49 +# CONFIG_HOTPLUG_PCI_CPCI is not set 3.50 +# CONFIG_HOTPLUG_PCI_SHPC is not set 3.51 3.52 # 3.53 # Executable file formats / Emulations 3.54 @@ -625,6 +660,10 @@ CONFIG_BT_HCIUART_BCSP=y 3.55 CONFIG_BT_HCIBCM203X=m 3.56 CONFIG_BT_HCIBPA10X=m 3.57 CONFIG_BT_HCIBFUSB=m 3.58 +# CONFIG_BT_HCIDTL1 is not set 3.59 +# CONFIG_BT_HCIBT3C is not set 3.60 +# CONFIG_BT_HCIBLUECARD is not set 3.61 +# CONFIG_BT_HCIBTUART is not set 3.62 CONFIG_BT_HCIVHCI=m 3.63 CONFIG_IEEE80211=m 3.64 # CONFIG_IEEE80211_DEBUG is not set 3.65 @@ -769,6 +808,7 @@ CONFIG_PARPORT=m 3.66 CONFIG_PARPORT_PC=m 3.67 # CONFIG_PARPORT_PC_FIFO is not set 3.68 # CONFIG_PARPORT_PC_SUPERIO is not set 3.69 +# CONFIG_PARPORT_PC_PCMCIA is not set 3.70 CONFIG_PARPORT_NOT_PC=y 3.71 # CONFIG_PARPORT_GSC is not set 3.72 CONFIG_PARPORT_1284=y 3.73 @@ -851,6 +891,7 @@ CONFIG_BLK_DEV_IDE=y 3.74 # CONFIG_BLK_DEV_HD_IDE is not set 3.75 CONFIG_BLK_DEV_IDEDISK=y 3.76 CONFIG_IDEDISK_MULTI_MODE=y 3.77 +# CONFIG_BLK_DEV_IDECS is not set 3.78 CONFIG_BLK_DEV_IDECD=y 3.79 # CONFIG_BLK_DEV_IDETAPE is not set 3.80 CONFIG_BLK_DEV_IDEFLOPPY=y 3.81 @@ -1012,6 +1053,13 @@ CONFIG_SCSI_DC390T=m 3.82 # CONFIG_SCSI_DEBUG is not set 3.83 3.84 # 3.85 +# PCMCIA SCSI adapter support 3.86 +# 3.87 +# CONFIG_PCMCIA_FDOMAIN is not set 3.88 +# CONFIG_PCMCIA_QLOGIC is not set 3.89 +# CONFIG_PCMCIA_SYM53C500 is not set 3.90 + 3.91 +# 3.92 # Multi-device support (RAID and LVM) 3.93 # 3.94 CONFIG_MD=y 3.95 @@ -1141,6 +1189,7 @@ CONFIG_DE4X5=m 3.96 CONFIG_WINBOND_840=m 3.97 CONFIG_DM9102=m 3.98 CONFIG_ULI526X=m 3.99 +# CONFIG_PCMCIA_XIRCOM is not set 3.100 # CONFIG_HP100 is not set 3.101 CONFIG_NET_PCI=y 3.102 CONFIG_PCNET32=m 3.103 @@ -1224,6 +1273,13 @@ CONFIG_NET_RADIO=y 3.104 # Obsolete Wireless cards support (pre-802.11) 3.105 # 3.106 # CONFIG_STRIP is not set 3.107 +# CONFIG_PCMCIA_WAVELAN is not set 3.108 +# CONFIG_PCMCIA_NETWAVE is not set 3.109 + 3.110 +# 3.111 +# Wireless 802.11 Frequency Hopping cards support 3.112 +# 3.113 +# CONFIG_PCMCIA_RAYCS is not set 3.114 3.115 # 3.116 # Wireless 802.11b ISA/PCI cards support 3.117 @@ -1243,6 +1299,15 @@ CONFIG_ATMEL=m 3.118 CONFIG_PCI_ATMEL=m 3.119 3.120 # 3.121 +# Wireless 802.11b Pcmcia/Cardbus cards support 3.122 +# 3.123 +# CONFIG_PCMCIA_HERMES is not set 3.124 +# CONFIG_PCMCIA_SPECTRUM is not set 3.125 +# CONFIG_AIRO_CS is not set 3.126 +# CONFIG_PCMCIA_ATMEL is not set 3.127 +# CONFIG_PCMCIA_WL3501 is not set 3.128 + 3.129 +# 3.130 # Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support 3.131 # 3.132 CONFIG_PRISM54=m 3.133 @@ -1250,9 +1315,15 @@ CONFIG_HOSTAP=m 3.134 # CONFIG_HOSTAP_FIRMWARE is not set 3.135 CONFIG_HOSTAP_PLX=m 3.136 CONFIG_HOSTAP_PCI=m 3.137 +# CONFIG_HOSTAP_CS is not set 3.138 CONFIG_NET_WIRELESS=y 3.139 3.140 # 3.141 +# PCMCIA network device support 3.142 +# 3.143 +# CONFIG_NET_PCMCIA is not set 3.144 + 3.145 +# 3.146 # Wan interfaces 3.147 # 3.148 # CONFIG_WAN is not set 3.149 @@ -1376,6 +1447,10 @@ CONFIG_HISAX_ENTERNOW_PCI=y 3.150 # 3.151 # HiSax PCMCIA card service modules 3.152 # 3.153 +# CONFIG_HISAX_SEDLBAUER_CS is not set 3.154 +# CONFIG_HISAX_ELSA_CS is not set 3.155 +# CONFIG_HISAX_AVM_A1_CS is not set 3.156 +# CONFIG_HISAX_TELES_CS is not set 3.157 3.158 # 3.159 # HiSax sub driver modules 3.160 @@ -1412,6 +1487,7 @@ CONFIG_CAPI_AVM=y 3.161 CONFIG_ISDN_DRV_AVMB1_B1PCI=m 3.162 CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y 3.163 CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m 3.164 +# CONFIG_ISDN_DRV_AVMB1_AVM_CS is not set 3.165 CONFIG_ISDN_DRV_AVMB1_T1PCI=m 3.166 CONFIG_ISDN_DRV_AVMB1_C4=m 3.167 3.168 @@ -1600,6 +1676,13 @@ CONFIG_DRM_RADEON=m 3.169 CONFIG_DRM_MGA=m 3.170 CONFIG_DRM_VIA=m 3.171 CONFIG_DRM_SAVAGE=m 3.172 + 3.173 +# 3.174 +# PCMCIA character devices 3.175 +# 3.176 +# CONFIG_SYNCLINK_CS is not set 3.177 +# CONFIG_CARDMAN_4000 is not set 3.178 +# CONFIG_CARDMAN_4040 is not set 3.179 # CONFIG_MWAVE is not set 3.180 # CONFIG_RAW_DRIVER is not set 3.181 # CONFIG_HPET is not set 3.182 @@ -2101,6 +2184,10 @@ CONFIG_SND_USB_AUDIO=m 3.183 CONFIG_SND_USB_USX2Y=m 3.184 3.185 # 3.186 +# PCMCIA devices 3.187 +# 3.188 + 3.189 +# 3.190 # Open Sound System 3.191 # 3.192 # CONFIG_SOUND_PRIME is not set 3.193 @@ -2134,6 +2221,7 @@ CONFIG_USB_OHCI_HCD=m 3.194 CONFIG_USB_OHCI_LITTLE_ENDIAN=y 3.195 CONFIG_USB_UHCI_HCD=m 3.196 CONFIG_USB_SL811_HCD=m 3.197 +# CONFIG_USB_SL811_CS is not set 3.198 3.199 # 3.200 # USB Device Class drivers 3.201 @@ -2284,6 +2372,7 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y 3.202 CONFIG_USB_SERIAL_TI=m 3.203 CONFIG_USB_SERIAL_CYBERJACK=m 3.204 CONFIG_USB_SERIAL_XIRCOM=m 3.205 +# CONFIG_USB_SERIAL_OPTION is not set 3.206 CONFIG_USB_SERIAL_OMNINET=m 3.207 CONFIG_USB_EZUSB=y 3.208 3.209 @@ -2649,7 +2738,7 @@ CONFIG_CRYPTO_CRC32C=m 3.210 # Hardware crypto devices 3.211 # 3.212 CONFIG_XEN=y 3.213 -CONFIG_NO_IDLE_HZ=y 3.214 +CONFIG_XEN_INTERFACE_VERSION=0x00030101 3.215 3.216 # 3.217 # XEN 3.218 @@ -2676,6 +2765,7 @@ CONFIG_XEN_DISABLE_SERIAL=y 3.219 CONFIG_XEN_SYSFS=m 3.220 CONFIG_HAVE_ARCH_ALLOC_SKB=y 3.221 CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y 3.222 +CONFIG_NO_IDLE_HZ=y 3.223 3.224 # 3.225 # Library routines
4.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig Thu Apr 13 11:26:01 2006 +0100 4.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig Thu Apr 13 15:15:56 2006 +0100 4.3 @@ -568,7 +568,6 @@ config UNORDERED_IO 4.4 from i386. Requires that the driver writer used memory barriers 4.5 properly. 4.6 4.7 -if !X86_64_XEN 4.8 source "drivers/pci/pcie/Kconfig" 4.9 4.10 source "drivers/pci/Kconfig" 4.11 @@ -576,7 +575,6 @@ source "drivers/pci/Kconfig" 4.12 source "drivers/pcmcia/Kconfig" 4.13 4.14 source "drivers/pci/hotplug/Kconfig" 4.15 -endif 4.16 4.17 endmenu 4.18