[kernel] r13650 - in dists/trunk/linux-2.6/debian/config: i386 kernelarch-x86
Bastian Blank
waldi at alioth.debian.org
Wed May 20 15:14:19 UTC 2009
Author: waldi
Date: Wed May 20 15:14:18 2009
New Revision: 13650
Log:
* debian/config/i386/config: Remove options.
* debian/config/i386/defines: Use split configs.
* debian/config/kernelarch-x86/config-arch-32: Add x86 32bit options.
Added:
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
Modified:
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/i386/defines
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config Wed May 20 15:12:51 2009 (r13649)
+++ dists/trunk/linux-2.6/debian/config/i386/config Wed May 20 15:14:18 2009 (r13650)
@@ -1,193 +1,7 @@
##
-## file: arch/Kconfig
-##
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_IBS=y
-
-##
-## file: arch/x86/Kconfig
-##
-# CONFIG_64BIT is not set
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_ES7000 is not set
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_VMI=y
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_MEMTEST is not set
-CONFIG_HPET_TIMER=y
-# CONFIG_MAXSMP is not set
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-# CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-## choice: High Memory Support
-# CONFIG_HIGHMEM64G is not set
-## end choice
-## choice: Memory split
-# CONFIG_VMSPLIT_3G is not set
-CONFIG_VMSPLIT_3G_OPT=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-## end choice
-# CONFIG_X86_PAE is not set
-# CONFIG_DIRECT_GBPAGES is not set
-# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_APM=m
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-CONFIG_PCI=y
-## choice: PCI access mode
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_GOANY=y
-## end choice
-CONFIG_PCI_MMCONFIG=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_GFX_WA=y
-CONFIG_ISA=y
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-# CONFIG_OLPC is not set
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-# CONFIG_M386 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MCORE2 is not set
-## end choice
-CONFIG_X86_PTRACE_BTS=y
-
-##
-## file: arch/x86/Kconfig.debug
-##
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_4KSTACKS is not set
-CONFIG_DOUBLEFAULT=y
-## choice: IO delay type
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-## end choice
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-CONFIG_OPTIMIZE_INLINING=y
-
-##
-## file: arch/x86/kernel/cpu/cpufreq/Kconfig
-##
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-
-##
-## file: arch/x86/kvm/Kconfig
-##
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-# CONFIG_KVM_TRACE is not set
-
-##
-## file: arch/x86/lguest/Kconfig
-##
-CONFIG_LGUEST_GUEST=y
-
-##
-## file: arch/x86/xen/Kconfig
-##
-CONFIG_XEN=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
-# CONFIG_XEN_DEBUG_FS is not set
-
-##
## file: crypto/Kconfig
##
CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_TWOFISH_586=m
##
## file: drivers/acpi/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines Wed May 20 15:12:51 2009 (r13649)
+++ dists/trunk/linux-2.6/debian/config/i386/defines Wed May 20 15:14:18 2009 (r13650)
@@ -11,17 +11,26 @@
kernel-arch: x86
[image]
+configs:
+ kernelarch-x86/config
+ i386/config
suggests: grub | lilo
[486_base]
class: x86
longclass: x86 and compatible
+[486_image]
+configs:
+ kernelarch-x86/config-arch-32
+
[686_base]
class: PPro/Celeron/PII/PIII/P4
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4
[686_image]
+configs:
+ kernelarch-x86/config-arch-32
recommends: libc6-i686
[686-bigmem_base]
@@ -29,6 +38,8 @@
longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with 4-64G RAM
[686-bigmem_image]
+configs:
+ kernelarch-x86/config-arch-32
desc-parts: xen
recommends: libc6-i686
@@ -37,6 +48,9 @@
longclass: all 64bit single- and multiprocessor AMD and Intel
[amd64_image]
-configs: amd64/config amd64/config.amd64
+configs:
+ kernelarch-x86/config-arch-64
+ amd64/config
+ amd64/config.amd64
recommends: libc6-i686
Added: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32 Wed May 20 15:14:18 2009 (r13650)
@@ -0,0 +1,78 @@
+##
+## file: arch/x86/Kconfig
+##
+# CONFIG_64BIT is not set
+# CONFIG_SPARSE_IRQ is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_RDC321X is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_ES7000 is not set
+CONFIG_VMI=y
+CONFIG_VM86=y
+CONFIG_TOSHIBA=m
+# CONFIG_X86_REBOOTFIXUPS is not set
+## choice: Memory split
+# CONFIG_VMSPLIT_3G is not set
+CONFIG_VMSPLIT_3G_OPT=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+## end choice
+# CONFIG_X86_PAE is not set
+# CONFIG_DIRECT_GBPAGES is not set
+CONFIG_APM=m
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+# CONFIG_APM_DO_ENABLE is not set
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+## choice: PCI access mode
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+## end choice
+CONFIG_PCI_MMCONFIG=y
+CONFIG_ISA=y
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
+# CONFIG_OLPC is not set
+
+##
+## file: arch/x86/kernel/cpu/cpufreq/Kconfig
+##
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+##
+## file: arch/x86/lguest/Kconfig
+##
+CONFIG_LGUEST_GUEST=y
+
+##
+## file: arch/x86/xen/Kconfig
+##
+CONFIG_XEN_MAX_DOMAIN_MEMORY=8
+
+##
+## file: crypto/Kconfig
+##
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_TWOFISH_586=m
+
More information about the Kernel-svn-changes
mailing list