SOURCES (LINUX_2_6): kernel-i386.config - new config style
sparky
sparky at pld-linux.org
Sun Sep 28 00:26:56 CEST 2008
Author: sparky Date: Sat Sep 27 22:26:56 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- new config style
---- Files affected:
SOURCES:
kernel-i386.config (1.82.10.219 -> 1.82.10.220)
---- Diffs:
================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.219 SOURCES/kernel-i386.config:1.82.10.220
--- SOURCES/kernel-i386.config:1.82.10.219 Sat Sep 27 23:10:33 2008
+++ SOURCES/kernel-i386.config Sun Sep 28 00:26:50 2008
@@ -2,129 +2,129 @@
#-
#- *** FILE: arch/x86/Kconfig ***
#-
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-CONFIG_X86=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
+64BIT i386=n
+X86_32 i386=y
+X86_64 i386=n
+X86 i386=y
+GENERIC_TIME i386=y
+GENERIC_CMOS_UPDATE i386=y
+CLOCKSOURCE_WATCHDOG i386=y
+GENERIC_CLOCKEVENTS i386=y
+GENERIC_CLOCKEVENTS_BROADCAST i386=y
+LOCKDEP_SUPPORT i386=y
+STACKTRACE_SUPPORT i386=y
+ZONE_DMA i386=y
+GENERIC_ISA_DMA i386=y
+GENERIC_IOMAP i386=y
+GENERIC_BUG i386=y
+GENERIC_HWEIGHT i386=y
+ARCH_MAY_HAVE_PC_FDC i386=y
+RWSEM_GENERIC_SPINLOCK i386=y
+ARCH_HAS_ILOG2_U32 i386=n
+ARCH_HAS_ILOG2_U64 i386=n
+ARCH_POPULATES_NODE_MAP i386=y
+GENERIC_HARDIRQS i386=y
+GENERIC_IRQ_PROBE i386=y
+GENERIC_PENDING_IRQ i386=y
+X86_SMP i386=y
+X86_HT i386=y
+X86_BIOS_REBOOT i386=y
+X86_TRAMPOLINE i386=y
+KTIME_SCALAR i386=y
#- file init/Kconfig goes here
#- file kernel/time/Kconfig goes here
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_NUMAQ is not set
-# CONFIG_X86_SUMMIT is not set
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_VISWS is not set
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_ES7000 is not set
-# CONFIG_X86_RDC321X is not set
+X86_PC i386=y
+X86_ELAN i386=n
+X86_VOYAGER i386=n
+X86_NUMAQ i386=n
+X86_SUMMIT i386=n
+X86_BIGSMP i386=n
+X86_VISWS i386=n
+X86_GENERICARCH i386=n
+X86_ES7000 i386=n
+X86_RDC321X i386=n
#- file arch/x86/xen/Kconfig goes here
-# CONFIG_VMI is not set
+VMI i386=n
#- file arch/x86/lguest/Kconfig goes here
-CONFIG_PARAVIRT=y
+PARAVIRT i386=y
#- file arch/x86/Kconfig.cpu goes here
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-CONFIG_NR_CPUS=16
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
+HPET_TIMER i386=y
+HPET_EMULATE_RTC i386=y
+DMI i386=y
+NR_CPUS i386=16
+SCHED_SMT i386=y
+SCHED_MC i386=y
#- file kernel/Kconfig.preempt goes here
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_NONFATAL=m
-CONFIG_X86_MCE_P4THERMAL=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
+X86_UP_APIC i386=y
+X86_UP_IOAPIC i386=y
+X86_LOCAL_APIC i386=y
+X86_IO_APIC i386=y
+X86_MCE i386=y
+X86_MCE_NONFATAL i386=m
+X86_MCE_P4THERMAL i386=y
+VM86 i386=y
+TOSHIBA i386=m
+I8K i386=m
+X86_REBOOTFIXUPS i386=y
+MICROCODE i386=m
+MICROCODE_OLD_INTERFACE i386=y
+X86_MSR i386=m
+X86_CPUID i386=m
+NOHIGHMEM i386=n
+HIGHMEM4G i386=y
+HIGHMEM64G i386=n
+PAGE_OFFSET i386=0xC0000000
+HIGHMEM i386=y
#- NUMA (Summit) requires SMP, 64GB highmem support, ACPI
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+ARCH_FLATMEM_ENABLE i386=y
+ARCH_SPARSEMEM_ENABLE i386=y
+ARCH_SELECT_MEMORY_MODEL i386=y
#- file mm/Kconfig goes here
-# CONFIG_HIGHPTE is not set
-CONFIG_MATH_EMULATION=y
-CONFIG_MTRR=y
-CONFIG_EFI=y
-# CONFIG_IRQBALANCE is not set
-CONFIG_SECCOMP=y
+HIGHPTE i386=n
+MATH_EMULATION i386=y
+MTRR i386=y
+EFI i386=y
+IRQBALANCE i386=n
+SECCOMP i386=y
#- file kernel/Kconfig.hz goes here
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-CONFIG_PHYSICAL_START=0x100000
-CONFIG_RELOCATABLE=y
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+KEXEC i386=y
+CRASH_DUMP i386=n
+PHYSICAL_START i386=0x100000
+RELOCATABLE i386=y
+PHYSICAL_ALIGN i386=0x100000
+HOTPLUG_CPU i386=y
+COMPAT_VDSO i386=n
+ARCH_ENABLE_MEMORY_HOTPLUG i386=y
#- file kernel/power/Kconfig goes here
#- file drivers/acpi/Kconfig goes here
-CONFIG_APM=m
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-# CONFIG_APM_DO_ENABLE is not set
-CONFIG_APM_CPU_IDLE=y
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-CONFIG_APM_REAL_MODE_POWER_OFF=y
+APM i386=m
+APM_IGNORE_USER_SUSPEND i386=n
+APM_DO_ENABLE i386=n
+APM_CPU_IDLE i386=y
+APM_DISPLAY_BLANK i386=n
+APM_ALLOW_INTS i386=n
+APM_REAL_MODE_POWER_OFF i386=y
#- file arch/x86/kernel/cpu/cpufreq/Kconfig goes here
#- file drivers/cpuidle/Kconfig goes here
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
+PCI_GOBIOS i386=n
+PCI_GOMMCONFIG i386=n
+PCI_GODIRECT i386=n
+PCI_GOANY i386=y
+PCI_BIOS i386=y
+PCI_DIRECT i386=y
+PCI_MMCONFIG i386=y
#- file drivers/pci/pcie/Kconfig goes here
#- file drivers/pci/Kconfig goes here
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-CONFIG_EISA=y
+ISA_DMA_API i386=y
+ISA i386=y
+EISA i386=y
#- file drivers/eisa/Kconfig goes here
-CONFIG_MCA=y
+MCA i386=y
#- file drivers/mca/Kconfig goes here
-CONFIG_SCx200=m
-CONFIG_SCx200HR_TIMER=m
-# CONFIG_OLPC is not set
-CONFIG_K8_NB=y
+SCx200 i386=m
+SCx200HR_TIMER i386=m
+OLPC i386=n
+K8_NB i386=y
#- file drivers/pcmcia/Kconfig goes here
#- file drivers/pci/hotplug/Kconfig goes here
#- file fs/Kconfig.binfmt goes here
@@ -142,75 +142,75 @@
#-
#- *** FILE: arch/x86/Kconfig.cpu ***
#-
-CONFIG_M386=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 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_MWINCHIP2 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
-CONFIG_X86_GENERIC=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_PPRO_FENCE=y
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_INTEL_USERCOPY=y
+M386 i386=y
+M486 i386=n
+M586 i386=n
+M586TSC i386=n
+M586MMX i386=n
+M686 i386=n
+MPENTIUMII i386=n
+MPENTIUMIII i386=n
+MPENTIUMM i386=n
+MPENTIUM4 i386=n
+MK6 i386=n
+MK7 i386=n
+MK8 i386=n
+MCRUSOE i386=n
+MEFFICEON i386=n
+MWINCHIPC6 i386=n
+MWINCHIP2 i386=n
+MWINCHIP3D i386=n
+MGEODEGX1 i386=n
+MGEODE_LX i386=n
+MCYRIXIII i386=n
+MVIAC3_2 i386=n
+MVIAC7 i386=n
+MCORE2 i386=n
+X86_GENERIC i386=y
+X86_L1_CACHE_SHIFT i386=7
+X86_PPRO_FENCE i386=y
+X86_F00F_BUG i386=y
+X86_INTEL_USERCOPY i386=y
#-
#- *** FILE: arch/x86/Kconfig.debug ***
#-
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+TRACE_IRQFLAGS_SUPPORT i386=y
#- file lib/Kconfig.debug goes here
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_RODATA is not set
-# CONFIG_4KSTACKS is not set
-CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_MPPARSE=y
-CONFIG_DOUBLEFAULT=y
+DEBUG_STACKOVERFLOW i386=n
+DEBUG_STACK_USAGE i386=n
+DEBUG_RODATA i386=n
+4KSTACKS i386=n
+X86_FIND_SMP_CONFIG i386=y
+X86_MPPARSE i386=y
+DOUBLEFAULT i386=y
#-
#- *** FILE: arch/x86/kernel/cpu/cpufreq/Kconfig ***
#-
#- file drivers/cpufreq/Kconfig goes here
#- CPUFreq processor drivers
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_POWERNOW_K8_ACPI=y
-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_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
+X86_ACPI_CPUFREQ i386=m
+X86_POWERNOW_K6 i386=m
+X86_POWERNOW_K7 i386=m
+X86_POWERNOW_K7_ACPI i386=y
+X86_POWERNOW_K8 i386=m
+X86_POWERNOW_K8_ACPI i386=y
+X86_GX_SUSPMOD i386=m
+X86_SPEEDSTEP_CENTRINO i386=m
+X86_SPEEDSTEP_CENTRINO_TABLE i386=y
+X86_SPEEDSTEP_ICH i386=m
+X86_SPEEDSTEP_SMI i386=m
+X86_CPUFREQ_NFORCE2 i386=m
+X86_LONGRUN i386=m
+X86_LONGHAUL i386=m
+X86_E_POWERSAVER i386=m
#- shared options
-CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=y
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+X86_ACPI_CPUFREQ_PROC_INTF i386=y
+X86_SPEEDSTEP_LIB i386=m
+X86_SPEEDSTEP_RELAXED_CAP_CHECK i386=y
#-
#- *** FILE: arch/x86/xen/Kconfig ***
#-
-# CONFIG_XEN is not set
+XEN i386=n
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-i386.config?r1=1.82.10.219&r2=1.82.10.220&f=u
More information about the pld-cvs-commit
mailing list