debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Move various i386-dependent config symbols into the appropriate config file 

These now all have dependencies on X86_32 || COMPILE_TEST, so they
cannot be enabled on amd64.

Also remove the explicit disabling of these symbols at the top level.

svn path=/dists/trunk/linux/; revision=21772
This commit is contained in:
Ben Hutchings 2014-09-07 18:50:43 +00:00
parent 7fb242322b
commit caf5baf65d
3 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/config/config vendored
View File

@ -174,8 +174,6 @@ CONFIG_PATA_ARTOP=m
# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD64X=m
# CONFIG_PATA_CS5520 is not set
# CONFIG_PATA_CS5530 is not set
# CONFIG_PATA_CS5536 is not set
# CONFIG_PATA_CYPRESS is not set
# CONFIG_PATA_EFAR is not set
@ -196,7 +194,6 @@ CONFIG_PATA_NINJA32=m
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
CONFIG_PATA_RDC=m
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
# CONFIG_PATA_SERVERWORKS is not set
# CONFIG_PATA_SIL680 is not set
@ -457,7 +454,6 @@ CONFIG_EFI_VARS_PSTORE=m
# CONFIG_GPIO_CS5535 is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_INTEL_MID is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
# CONFIG_GPIO_RDC321X is not set
# CONFIG_GPIO_MAX7301 is not set
@ -729,7 +725,6 @@ CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_ISCH=m
CONFIG_I2C_NFORCE2_S4985=m
# CONFIG_I2C_CBUS_GPIO is not set
# CONFIG_I2C_EG20T is not set
# CONFIG_I2C_GPIO is not set
CONFIG_I2C_OCORES=m
CONFIG_I2C_PCA_PLATFORM=m
@ -2045,7 +2040,6 @@ CONFIG_TI_DAC7512=m
CONFIG_VMWARE_BALLOON=m
# CONFIG_BMP085_I2C is not set
# CONFIG_BMP085_SPI is not set
# CONFIG_PCH_PHUB is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
# CONFIG_SRAM is not set
@ -2231,7 +2225,6 @@ CONFIG_CAN_SLCAN=m
CONFIG_CAN_DEV=m
CONFIG_CAN_CALC_BITTIMING=y
# CONFIG_CAN_LEDS is not set
# CONFIG_PCH_CAN is not set
# CONFIG_CAN_DEBUG_DEVICES is not set
##
@ -2505,11 +2498,6 @@ CONFIG_VXGE=m
##
CONFIG_NET_VENDOR_OKI=y
##
## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
##
# CONFIG_PCH_GBE is not set
##
## file: drivers/net/ethernet/packetengines/Kconfig
##
@ -3721,7 +3709,6 @@ CONFIG_SERIAL_MFD_HSU=m
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
# CONFIG_SERIAL_IFX6X60 is not set
# CONFIG_SERIAL_PCH_UART is not set
# CONFIG_SERIAL_XILINX_PS_UART is not set
# CONFIG_SERIAL_ARC is not set
CONFIG_SERIAL_RP2=m

24
debian/config/kernelarch-x86/config vendored
View File

@ -194,8 +194,6 @@ CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@ -204,7 +202,6 @@ CONFIG_PATA_NS87415=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_TRIFLEX=m
@ -383,7 +380,6 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
##
CONFIG_DMADEVICES=y
CONFIG_INTEL_IOATDMA=m
CONFIG_PCH_DMA=m
CONFIG_NET_DMA=y
##
@ -437,7 +433,6 @@ CONFIG_EFI_RUNTIME_MAP=y
# CONFIG_GPIO_ICH is not set
# CONFIG_GPIO_LYNXPOINT is not set
# CONFIG_GPIO_INTEL_MID is not set
CONFIG_GPIO_PCH=m
CONFIG_GPIO_ML_IOH=m
##
@ -594,7 +589,6 @@ CONFIG_I2C_SCMI=m
#. Sony Vaio Duo 13".
CONFIG_I2C_DESIGNWARE_PLATFORM=m
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_EG20T=m
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PCA_ISA=m
@ -769,7 +763,6 @@ CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
CONFIG_CS5535_MFGPT=m
CONFIG_HP_ILO=m
CONFIG_PCH_PHUB=m
##
## file: drivers/misc/mei/Kconfig
@ -898,11 +891,6 @@ CONFIG_ARCNET_COM20020=m
CONFIG_ARCNET_COM20020_PCI=m
CONFIG_ARCNET_COM20020_CS=m
##
## file: drivers/net/can/Kconfig
##
CONFIG_PCH_CAN=m
##
## file: drivers/net/ethernet/Kconfig
##
@ -993,11 +981,6 @@ CONFIG_NATSEMI=m
CONFIG_NET_VENDOR_NVIDIA=y
CONFIG_FORCEDETH=m
##
## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
##
CONFIG_PCH_GBE=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
@ -1293,11 +1276,6 @@ CONFIG_PCMCIA_SYM53C500=m
##
CONFIG_SFI=y
##
## file: drivers/spi/Kconfig
##
CONFIG_SPI_TOPCLIFF_PCH=m
##
## file: drivers/staging/comedi/Kconfig
##
@ -1537,7 +1515,6 @@ CONFIG_N_HDLC=m
## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_JSM=m
CONFIG_SERIAL_PCH_UART=m
##
## file: drivers/tty/serial/8250/Kconfig
@ -1674,7 +1651,6 @@ CONFIG_HPWDT_NMI_DECODING=y
CONFIG_SC1200_WDT=m
CONFIG_NV_TCO=m
CONFIG_60XX_WDT=m
CONFIG_SBC8360_WDT=m
CONFIG_CPU5_WDT=m
CONFIG_VIA_WDT=m
CONFIG_W83627HF_WDT=m

32
debian/config/kernelarch-x86/config-arch-32 vendored
View File

@ -65,8 +65,11 @@ CONFIG_CRYPTO_TWOFISH_586=m
##
## file: drivers/ata/Kconfig
##
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_ISAPNP=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_LEGACY=m
@ -128,11 +131,17 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
##
CONFIG_CRYPTO_DEV_GEODE=m
##
## file: drivers/dma/Kconfig
##
CONFIG_PCH_DMA=m
##
## file: drivers/gpio/Kconfig
##
CONFIG_GPIO_VX855=m
CONFIG_GPIO_CS5535=m
CONFIG_GPIO_PCH=m
##
## file: drivers/gpu/drm/Kconfig
@ -142,6 +151,7 @@ CONFIG_DRM_I810=m
##
## file: drivers/i2c/busses/Kconfig
##
CONFIG_I2C_EG20T=m
CONFIG_I2C_PXA=m
CONFIG_SCx200_I2C=m
CONFIG_SCx200_I2C_SCL=12
@ -215,6 +225,7 @@ CONFIG_MFD_VX855=m
##
CONFIG_CS5535_MFGPT=m
CONFIG_CS5535_CLOCK_EVENT_SRC=m
CONFIG_PCH_PHUB=m
##
## file: drivers/mtd/maps/Kconfig
@ -228,6 +239,11 @@ CONFIG_MTD_PCMCIA=m
##
CONFIG_ARCNET_COM20020_ISA=m
##
## file: drivers/net/can/Kconfig
##
CONFIG_PCH_CAN=m
##
## file: drivers/net/can/cc770/Kconfig
##
@ -273,6 +289,11 @@ CONFIG_NET_VENDOR_DEC=y
##
CONFIG_NET_VENDOR_FUJITSU=y
##
## file: drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
##
CONFIG_PCH_GBE=m
##
## file: drivers/net/ethernet/realtek/Kconfig
##
@ -368,6 +389,11 @@ CONFIG_SCSI_NSP32=m
##
CONFIG_PCMCIA_NINJA_SCSI=m
##
## file: drivers/spi/Kconfig
##
CONFIG_SPI_TOPCLIFF_PCH=m
##
## file: drivers/staging/comedi/Kconfig
##
@ -423,6 +449,11 @@ CONFIG_FB_OLPC_DCON_1_5=y
##
# CONFIG_ISI is not set
##
## file: drivers/tty/serial/Kconfig
##
CONFIG_SERIAL_PCH_UART=m
##
## file: drivers/tty/serial/8250/Kconfig
##
@ -448,6 +479,7 @@ CONFIG_FB_SAVAGE_I2C=y
## file: drivers/watchdog/Kconfig
##
CONFIG_SCx200_WDT=m
CONFIG_SBC8360_WDT=m
CONFIG_SBC7240_WDT=m
CONFIG_PCWATCHDOG=m
CONFIG_MIXCOMWD=m