[kernel] r13642 - in dists/trunk/linux-2.6/debian/config: amd64 kernelarch-x86

[Bastian Blank]

Author: waldi
Date: Wed May 20 14:13:39 2009
New Revision: 13642

Log:
* debian/config/amd64/config: Remove some options.
* debian/config/amd64/defines: Include new config files.
* debian/config/kernelarch-x86: New directory.
* debian/config/kernelarch-x86/config: Add x86 generic options.
* debian/config/kernelarch-x86/config-arch-64: Add x86 64bit options.

Added:
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
Modified:
   dists/trunk/linux-2.6/debian/config/amd64/config
   dists/trunk/linux-2.6/debian/config/amd64/defines

Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 13:20:19 2009	(r13641)
+++ dists/trunk/linux-2.6/debian/config/amd64/config	Wed May 20 14:13:39 2009	(r13642)
@@ -1,125 +1,4 @@
 ##
-## file: arch/Kconfig
-##
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_IBS=y
-
-##
-## file: arch/x86/Kconfig
-##
-CONFIG_64BIT=y
-CONFIG_SPARSE_IRQ=y
-CONFIG_NUMA_MIGRATE_IRQ_DESC=y
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_VSMP is not set
-CONFIG_PARAVIRT_GUEST=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_CALGARY_IOMMU=y
-CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
-# CONFIG_MAXSMP is not set
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_I8K=m
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_DIRECT_GBPAGES is not set
-CONFIG_NODES_SHIFT=6
-# 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_CC_STACKPROTECTOR is not set
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x200000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x200000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_PCI=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_GFX_WA=y
-CONFIG_INTR_REMAP=y
-CONFIG_IA32_EMULATION=y
-CONFIG_IA32_AOUT=y
-
-##
-## file: arch/x86/Kconfig.cpu
-##
-## choice: Processor family
-# 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_IOMMU_DEBUG is not set
-## 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_K8=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-# CONFIG_X86_P4_CLOCKMOD is not set
-
-##
-## 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/xen/Kconfig
-##
-CONFIG_XEN=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=32
-# CONFIG_XEN_DEBUG_FS is not set
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_CRC32C_INTEL=m

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	Wed May 20 13:20:19 2009	(r13641)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Wed May 20 14:13:39 2009	(r13642)
@@ -8,9 +8,16 @@
 kernel-arch: x86
 
 [image]
+configs:
+ kernelarch-x86/config
+ amd64/config
 suggests: grub | lilo
 
 [amd64_base]
 class: AMD64
 longclass: all 64bit single- and multiprocessor AMD and Intel
 
+[amd64_image]
+configs:
+ kernelarch-x86/config-arch-64
+ amd64/config.amd64

Added: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Wed May 20 14:13:39 2009	(r13642)
@@ -0,0 +1,115 @@
+##
+## file: arch/Kconfig
+##
+CONFIG_OPROFILE=m
+CONFIG_OPROFILE_IBS=y
+
+##
+## file: arch/x86/Kconfig
+##
+CONFIG_SPARSE_IRQ=y
+CONFIG_NUMA_MIGRATE_IRQ_DESC=y
+CONFIG_X86_MPPARSE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_PARAVIRT_GUEST=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_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_NODES_SHIFT=6
+# 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_CC_STACKPROTECTOR is not set
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_RELOCATABLE is not set
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_PCI=y
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_DMAR_GFX_WA=y
+CONFIG_INTR_REMAP=y
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+
+##
+## file: arch/x86/Kconfig.cpu
+##
+## choice: Processor family
+# CONFIG_MK8 is not set
+# CONFIG_MCORE2 is not set
+CONFIG_GENERIC_CPU=y
+## 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_IOMMU_DEBUG is not set
+## 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_SPEEDSTEP_CENTRINO=m
+# CONFIG_X86_P4_CLOCKMOD is not set
+
+##
+## 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/xen/Kconfig
+##
+CONFIG_XEN=y
+# CONFIG_XEN_DEBUG_FS is not set
+
+##
+## file: unknown
+##
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+

Added: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Wed May 20 14:13:39 2009	(r13642)
@@ -0,0 +1,22 @@
+##
+## file: arch/x86/Kconfig
+##
+CONFIG_64BIT=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+# CONFIG_MAXSMP is not set
+CONFIG_X86_MCE_INTEL=y
+CONFIG_PCI_MMCONFIG=y
+
+##
+## file: arch/x86/kernel/cpu/cpufreq/Kconfig
+##
+CONFIG_X86_POWERNOW_K8=m
+
+##
+## file: arch/x86/xen/Kconfig
+##
+CONFIG_XEN_MAX_DOMAIN_MEMORY=32
+