[kernel] r19541 - in dists/trunk/linux/debian/config: amd64 amd64/none i386 i386/none i386/rt

Bastian Blank waldi at alioth.debian.org
Mon Nov 26 22:13:37 UTC 2012 

Author: waldi
Date: Mon Nov 26 22:13:37 2012
New Revision: 19541

Log:
* debian/config/amd64/defines, debian/config/i386/defines:
  Make none again an implicit featureset.
* debian/config/amd64/none, debian/config/i386/none,
  debian/config/i386/rt/config.686-pae: Remove.
* debian/config/i386/config.486, debian/config/i386/config.686-pae: Move.

Added:
   dists/trunk/linux/debian/config/i386/config.486
      - copied unchanged from r19528, dists/trunk/linux/debian/config/i386/none/config.486
   dists/trunk/linux/debian/config/i386/config.686-pae
      - copied unchanged from r19533, dists/trunk/linux/debian/config/i386/none/config.686-pae
Deleted:
   dists/trunk/linux/debian/config/amd64/none/
   dists/trunk/linux/debian/config/i386/none/
   dists/trunk/linux/debian/config/i386/rt/config.686-pae
Modified:
   dists/trunk/linux/debian/config/amd64/defines
   dists/trunk/linux/debian/config/i386/defines

Modified: dists/trunk/linux/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux/debian/config/amd64/defines	Mon Nov 26 19:46:06 2012	(r19540)
+++ dists/trunk/linux/debian/config/amd64/defines	Mon Nov 26 22:13:37 2012	(r19541)
@@ -1,7 +1,8 @@
 [base]
 featuresets:
- none
  rt
+flavours:
+ amd64
 kernel-arch: x86
 
 [build]
@@ -15,7 +16,13 @@
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64

Copied: dists/trunk/linux/debian/config/i386/config.486 (from r19528, dists/trunk/linux/debian/config/i386/none/config.486)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/config/i386/config.486	Mon Nov 26 22:13:37 2012	(r19541, copy of r19528, dists/trunk/linux/debian/config/i386/none/config.486)
@@ -0,0 +1,143 @@
+##
+## file: arch/x86/Kconfig
+##
+# CONFIG_SMP is not set
+CONFIG_X86_32_IRIS=m
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+# CONFIG_X86_MCE is not set
+CONFIG_MATH_EMULATION=y
+CONFIG_EISA=y
+CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+CONFIG_M486=y
+# CONFIG_M686 is not set
+## end choice
+
+##
+## file: drivers/eisa/Kconfig
+##
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+CONFIG_I2C_ELEKTOR=m
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/idle/Kconfig
+##
+# CONFIG_INTEL_IDLE is not set
+
+##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_OLPC=y
+
+##
+## file: drivers/mtd/chips/Kconfig
+##
+# CONFIG_MTD_XIP is not set
+
+##
+## file: drivers/net/ethernet/8390/Kconfig
+##
+CONFIG_NET_VENDOR_8390=y
+CONFIG_ES3210=m
+CONFIG_LNE390=m
+CONFIG_NE3210=m
+CONFIG_ULTRA32=m
+
+##
+## file: drivers/net/ethernet/i825xx/Kconfig
+##
+CONFIG_NET_VENDOR_I825XX=y
+
+##
+## file: drivers/net/ethernet/natsemi/Kconfig
+##
+CONFIG_NET_VENDOR_NATSEMI=y
+
+##
+## file: drivers/net/ethernet/racal/Kconfig
+##
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI5010=m
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+CONFIG_DMASCC=m
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
+
+##
+## file: drivers/platform/x86/Kconfig
+##
+CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
+
+##
+## file: drivers/power/Kconfig
+##
+CONFIG_BATTERY_OLPC=m
+
+##
+## file: drivers/scsi/Kconfig
+##
+CONFIG_SCSI_NCR_D700=m
+CONFIG_SCSI_NCR_Q720=m
+CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
+CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
+CONFIG_SCSI_NCR53C8XX_SYNC=5
+CONFIG_SCSI_SIM710=m
+
+##
+## file: drivers/tty/Kconfig
+##
+CONFIG_MOXA_INTELLIO=m
+
+##
+## file: drivers/video/geode/Kconfig
+##
+CONFIG_FB_GEODE=y
+CONFIG_FB_GEODE_LX=m
+CONFIG_FB_GEODE_GX=m
+CONFIG_FB_GEODE_GX1=m
+
+##
+## file: mm/Kconfig
+##
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+
+##
+## file: unknown
+##
+CONFIG_ELMC=m
+CONFIG_ELMC_II=m
+CONFIG_IBMLANA=m
+# CONFIG_IBMMCA_SCSI_DEV_RESET is not set
+CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y
+CONFIG_MCA=y
+CONFIG_MCA_LEGACY=y
+# CONFIG_MCA_PROC_FS is not set
+CONFIG_NE2_MCA=m
+CONFIG_SCSI_FD_MCS=m
+CONFIG_SCSI_IBMMCA=m
+CONFIG_ULTRAMCA=m
+

Copied: dists/trunk/linux/debian/config/i386/config.686-pae (from r19533, dists/trunk/linux/debian/config/i386/none/config.686-pae)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux/debian/config/i386/config.686-pae	Mon Nov 26 22:13:37 2012	(r19541, copy of r19533, dists/trunk/linux/debian/config/i386/none/config.686-pae)
@@ -0,0 +1,52 @@
+##
+## file: arch/x86/Kconfig
+##
+# CONFIG_X86_32_IRIS is not set
+## choice: High Memory Support
+# CONFIG_NOHIGHMEM is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
+## end choice
+CONFIG_X86_PAE=y
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_EISA is not set
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_M486 is not set
+CONFIG_M686=y
+## end choice
+
+##
+## file: drivers/i2c/busses/Kconfig
+##
+# CONFIG_I2C_ELEKTOR is not set
+CONFIG_I2C_STUB=m
+
+##
+## file: drivers/net/ethernet/racal/Kconfig
+##
+# CONFIG_NI5010 is not set
+
+##
+## file: drivers/net/hamradio/Kconfig
+##
+# CONFIG_DMASCC is not set
+
+##
+## file: drivers/pci/hotplug/Kconfig
+##
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+
+##
+## file: drivers/tty/Kconfig
+##
+# CONFIG_MOXA_INTELLIO is not set
+
+##
+## file: lib/Kconfig.debug
+##
+# CONFIG_DEBUG_HIGHMEM is not set
+

Modified: dists/trunk/linux/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux/debian/config/i386/defines	Mon Nov 26 19:46:06 2012	(r19540)
+++ dists/trunk/linux/debian/config/i386/defines	Mon Nov 26 22:13:37 2012	(r19541)
@@ -1,7 +1,10 @@
 [base]
 featuresets:
- none
  rt
+flavours:
+ 486
+ 686-pae
+ amd64
 kernel-arch: x86
 
 [description]
@@ -23,6 +26,7 @@
 [486_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.486
 
 [686-pae_build]
 debug-info: true
@@ -30,18 +34,31 @@
 [686-pae_description]
 hardware: modern PCs
 hardware-long: PCs with one or more processors supporting PAE
-parts: pae
+parts: pae xen
 
 [686-pae_image]
 configs:
  kernelarch-x86/config-arch-32
+ i386/config.686-pae
 recommends: libc6-i686
 
+[686-pae_xen]
+dom0-support: true
+flavours:
+ i386
+ amd64
+
 [amd64_description]
 hardware: 64-bit PCs
 hardware-long: PCs with AMD64 or Intel 64 processors
+parts: xen
 
 [amd64_image]
 configs:
  kernelarch-x86/config-arch-64
 recommends: libc6-i686
+
+[amd64_xen]
+dom0-support: true
+flavours:
+ amd64

More information about the Kernel-svn-changes mailing list