[or-cvs] r18384: {torvm} Restore support for i586+ optimizations and remove new defau (torvm/trunk/build/kamikaze/patches)

coderman at seul.org coderman at seul.org
Wed Feb 4 10:45:49 UTC 2009


Author: coderman
Date: 2009-02-04 05:45:48 -0500 (Wed, 04 Feb 2009)
New Revision: 18384

Modified:
   torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
Log:
Restore support for i586+ optimizations and remove new default drivers that are not needed, misc cleanup.

Modified: torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch	2009-02-04 08:27:36 UTC (rev 18383)
+++ torvm/trunk/build/kamikaze/patches/003-kamikaze-kernel-config.patch	2009-02-04 10:45:48 UTC (rev 18384)
@@ -19,7 +19,7 @@
  
 diff -Naur a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
 --- a/target/linux/x86/config-2.6.27	2008-12-10 01:39:29.530827000 +0000
-+++ b/target/linux/x86/config-2.6.27	2009-02-03 11:35:36.768096760 +0000
++++ b/target/linux/x86/config-2.6.27	2009-02-04 10:34:23.510720272 +0000
 @@ -1,8 +1,9 @@
 +# CONFIG_BSD_PROCESS_ACCT is not set
  # CONFIG_3C515 is not set
@@ -32,8 +32,22 @@
  # CONFIG_8139TOO_8129 is not set
  CONFIG_8139TOO_PIO=y
  # CONFIG_8139TOO_TUNE_TWISTER is not set
-@@ -31,7 +32,7 @@
- CONFIG_ARCH_SUSPEND_POSSIBLE=y
+@@ -20,18 +21,18 @@
+ CONFIG_ARCH_HAS_CPU_RELAX=y
+ # CONFIG_ARCH_HAS_ILOG2_U32 is not set
+ # CONFIG_ARCH_HAS_ILOG2_U64 is not set
+-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
++# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
+ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+ CONFIG_ARCH_POPULATES_NODE_MAP=y
+ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+ CONFIG_ARCH_SPARSEMEM_ENABLE=y
+ CONFIG_ARCH_SUPPORTS_AOUT=y
+-CONFIG_ARCH_SUPPORTS_MSI=y
++# CONFIG_ARCH_SUPPORTS_MSI is not set
+ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+-CONFIG_ARCH_SUSPEND_POSSIBLE=y
++# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
  CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
  # CONFIG_AT1700 is not set
 -CONFIG_ATA=m
@@ -85,32 +99,68 @@
  # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
  CONFIG_EARLY_PRINTK=y
  # CONFIG_EDAC is not set
-@@ -117,7 +100,6 @@
- CONFIG_FS_POSIX_ACL=y
+@@ -111,13 +94,11 @@
+ # CONFIG_EUROTECH_WDT is not set
+ CONFIG_EXT2_FS=y
+ CONFIG_FAST_CMPXCHG_LOCAL=y
+-CONFIG_FIRMWARE_IN_KERNEL=y
+-CONFIG_FIRMWARE_MEMMAP=y
++# CONFIG_FIRMWARE_IN_KERNEL is not set
++# CONFIG_FIRMWARE_MEMMAP is not set
+ CONFIG_FIX_EARLYCON_MEM=y
+-CONFIG_FS_POSIX_ACL=y
  CONFIG_GENERIC_BUG=y
  CONFIG_GENERIC_CLOCKEVENTS=y
 -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
  CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  CONFIG_GENERIC_CMOS_UPDATE=y
  # CONFIG_GENERIC_CPU is not set
-@@ -149,7 +131,7 @@
- CONFIG_HAVE_KVM=y
- CONFIG_HAVE_LATENCYTOP_SUPPORT=y
- CONFIG_HAVE_OPROFILE=y
+@@ -133,23 +114,23 @@
+ CONFIG_HAS_DMA=y
+ CONFIG_HAS_IOMEM=y
+ CONFIG_HAS_IOPORT=y
+-CONFIG_HAVE_ARCH_KGDB=y
++# CONFIG_HAVE_ARCH_KGDB is not set
+ # CONFIG_HAVE_ARCH_TRACEHOOK is not set
+ # CONFIG_HAVE_CLK is not set
+ # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
+ # CONFIG_HAVE_DMA_ATTRS is not set
+-CONFIG_HAVE_DYNAMIC_FTRACE=y
+-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+-CONFIG_HAVE_FTRACE=y
++# CONFIG_HAVE_DYNAMIC_FTRACE is not set
++# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
++# CONFIG_HAVE_FTRACE is not set
+ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+ CONFIG_HAVE_IDE=y
+ CONFIG_HAVE_IOREMAP_PROT=y
+-CONFIG_HAVE_KPROBES=y
+-CONFIG_HAVE_KRETPROBES=y
+-CONFIG_HAVE_KVM=y
+-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+-CONFIG_HAVE_OPROFILE=y
 -CONFIG_HAVE_SETUP_PER_CPU_AREA=y
++# CONFIG_HAVE_KPROBES is not set
++# CONFIG_HAVE_KRETPROBES is not set
++# CONFIG_HAVE_KVM is not set
++# CONFIG_HAVE_LATENCYTOP_SUPPORT is not set
++# CONFIG_HAVE_OPROFILE is not set
 +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
  CONFIG_HID=y
  CONFIG_HID_SUPPORT=y
-@@ -160,19 +142,19 @@
+@@ -158,21 +139,21 @@
+ # CONFIG_HIGH_RES_TIMERS is not set
+ # CONFIG_HPET_TIMER is not set
  # CONFIG_HP_WATCHDOG is not set
- CONFIG_HT_IRQ=y
+-CONFIG_HT_IRQ=y
++# CONFIG_HT_IRQ is not set
  # CONFIG_HUGETLBFS is not set
 -CONFIG_HWMON=m
-+CONFIG_HWMON=y
++# CONFIG_HWMON is not set
  # CONFIG_HWMON_DEBUG_CHIP is not set
 -CONFIG_HWMON_VID=m
-+CONFIG_HWMON_VID=y
++# CONFIG_HWMON_VID is not set
  CONFIG_HW_CONSOLE=y
  CONFIG_HW_RANDOM=y
  # CONFIG_HW_RANDOM_AMD is not set
@@ -127,7 +177,38 @@
  # CONFIG_I6300ESB_WDT is not set
  # CONFIG_I82365 is not set
  # CONFIG_I8K is not set
-@@ -222,7 +204,7 @@
+@@ -184,15 +165,10 @@
+ CONFIG_IDE_GENERIC=y
+ # CONFIG_IDE_PROC_FS is not set
+ CONFIG_IDE_TIMINGS=y
+-CONFIG_INITRAMFS_SOURCE=""
+ CONFIG_INPUT=y
+ # CONFIG_INPUT_EVDEV is not set
+ CONFIG_INPUT_KEYBOARD=y
+-CONFIG_INPUT_MOUSE=y
+-CONFIG_INPUT_MOUSEDEV=y
+-CONFIG_INPUT_MOUSEDEV_PSAUX=y
+-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
++# CONFIG_INPUT_MOUSE is not set
+ # CONFIG_IOMMU_HELPER is not set
+ CONFIG_IO_DELAY_0X80=y
+ # CONFIG_IO_DELAY_0XED is not set
+@@ -210,19 +186,19 @@
+ # CONFIG_IT8712F_WDT is not set
+ # CONFIG_ITCO_WDT is not set
+ CONFIG_KALLSYMS=y
+-CONFIG_KEXEC=y
++# CONFIG_KEXEC is not set
+ CONFIG_KEYBOARD_ATKBD=y
+ # CONFIG_KEYBOARD_LKKBD is not set
+ # CONFIG_KEYBOARD_NEWTON is not set
+ # CONFIG_KEYBOARD_STOWAWAY is not set
+ # CONFIG_KEYBOARD_SUNKBD is not set
+-# CONFIG_KEYBOARD_XTKBD is not set
++CONFIG_KEYBOARD_XTKBD=y
+ CONFIG_KMOD=y
+ CONFIG_KTIME_SCALAR=y
  # CONFIG_LANCE is not set
  # CONFIG_LEDS_ALIX is not set
  # CONFIG_LEDS_CLEVO_MAIL is not set
@@ -136,7 +217,7 @@
  # CONFIG_LEDS_WRAP is not set
  CONFIG_LOCK_KERNEL=y
  CONFIG_M386=y
-@@ -239,23 +221,22 @@
+@@ -239,35 +215,28 @@
  # CONFIG_MCRUSOE is not set
  # CONFIG_MCYRIXIII is not set
  # CONFIG_MDA_CONSOLE is not set
@@ -170,7 +251,20 @@
  # CONFIG_MIXCOMWD is not set
  # CONFIG_MK6 is not set
  # CONFIG_MK7 is not set
-@@ -315,24 +296,24 @@
+ # CONFIG_MK8 is not set
+ # CONFIG_MOUSE_BCM5974 is not set
+-CONFIG_MOUSE_PS2=y
+-CONFIG_MOUSE_PS2_ALPS=y
+-CONFIG_MOUSE_PS2_LIFEBOOK=y
+-CONFIG_MOUSE_PS2_LOGIPS2PP=y
+-CONFIG_MOUSE_PS2_SYNAPTICS=y
+-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+-CONFIG_MOUSE_PS2_TRACKPOINT=y
++# CONFIG_MOUSE_PS2 is not set
+ # CONFIG_MOUSE_SERIAL is not set
+ # CONFIG_MOUSE_VSXXXAA is not set
+ # CONFIG_MPENTIUM4 is not set
+@@ -315,24 +284,24 @@
  # CONFIG_MWINCHIP3D is not set
  # CONFIG_MWINCHIPC6 is not set
  CONFIG_NAMESPACES=y
@@ -182,8 +276,9 @@
  # CONFIG_NET_VENDOR_RACAL is not set
  # CONFIG_NET_VENDOR_SMC is not set
  CONFIG_NOHIGHMEM=y
- CONFIG_NR_CPUS=8
+-CONFIG_NR_CPUS=8
 -CONFIG_NSC_GPIO=m
++# CONFIG_NR_CPUS is not set
 +CONFIG_NSC_GPIO=y
  CONFIG_NVRAM=y
  # CONFIG_OLPC is not set
@@ -201,21 +296,24 @@
  CONFIG_PCI=y
  # CONFIG_PCIEPORTBUS is not set
  CONFIG_PCI_BIOS=y
-@@ -343,11 +324,11 @@
+@@ -343,11 +312,11 @@
  # CONFIG_PCI_GODIRECT is not set
  # CONFIG_PCI_GOMMCONFIG is not set
  # CONFIG_PCI_GOOLPC is not set
 -CONFIG_PCMCIA=m
-+CONFIG_PCMCIA=y
- CONFIG_PCMCIA_IOCTL=y
- CONFIG_PCMCIA_LOAD_CIS=y
- CONFIG_PCMCIA_PROBE=y
+-CONFIG_PCMCIA_IOCTL=y
+-CONFIG_PCMCIA_LOAD_CIS=y
+-CONFIG_PCMCIA_PROBE=y
 -CONFIG_PCNET32=m
++# CONFIG_PCMCIA is not set
++# CONFIG_PCMCIA_IOCTL is not set
++# CONFIG_PCMCIA_LOAD_CIS is not set
++# CONFIG_PCMCIA_PROBE is not set
 +CONFIG_PCNET32=y
  CONFIG_PCSPKR_PLATFORM=y
  # CONFIG_PCWATCHDOG is not set
  CONFIG_PHYSICAL_ALIGN=0x100000
-@@ -362,28 +343,28 @@
+@@ -362,28 +331,28 @@
  # CONFIG_RELOCATABLE is not set
  CONFIG_RFKILL_LEDS=y
  CONFIG_RTC=y
@@ -233,8 +331,9 @@
  # CONFIG_SCHED_HRTICK is not set
  CONFIG_SCHED_MC=y
  CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
- CONFIG_SCHED_SMT=y
+-CONFIG_SCHED_SMT=y
 -CONFIG_SCSI_WAIT_SCAN=m
++# CONFIG_SCHED_SMT is not set
 +CONFIG_SCSI_WAIT_SCAN=y
  CONFIG_SCx200=y
  CONFIG_SCx200HR_TIMER=y
@@ -253,7 +352,7 @@
  # CONFIG_SERIAL_8250_CS is not set
  # CONFIG_SERIAL_8250_EXTENDED is not set
  CONFIG_SERIAL_8250_PCI=y
-@@ -395,11 +376,18 @@
+@@ -395,11 +364,17 @@
  # CONFIG_SERIO_PCIPS2 is not set
  # CONFIG_SERIO_RAW is not set
  CONFIG_SERIO_SERPORT=y
@@ -261,7 +360,6 @@
 +# CONFIG_SMP is not set
 +CONFIG_BROKEN_ON_SMP=y
 +# CONFIG_USE_GENERIC_SMP_HELPERS is not set
-+CONFIG_LOCALVERSION="-torvm"
 +CONFIG_MODULES=y
 +CONFIG_TICK_ONESHOT=y
 +CONFIG_NO_HZ=y
@@ -275,41 +373,44 @@
  # CONFIG_SONYPI is not set
  CONFIG_SPARSEMEM_STATIC=y
  # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-@@ -414,65 +402,57 @@
+@@ -414,65 +389,52 @@
  # CONFIG_TOSHIBA is not set
  # CONFIG_TYPHOON is not set
  CONFIG_UID16=y
 -CONFIG_USB=m
 -CONFIG_USB_EHCI_HCD=m
-+CONFIG_USB=y
-+CONFIG_USB_EHCI_HCD=y
++# CONFIG_USB is not set
++# CONFIG_USB_EHCI_HCD is not set
  # CONFIG_USB_NET_DM9601 is not set
  # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
  # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 -CONFIG_USB_OHCI_HCD=m
-+CONFIG_USB_OHCI_HCD=y
++# CONFIG_USB_OHCI_HCD is not set
  # CONFIG_USB_SERIAL_OTI6858 is not set
- CONFIG_USB_SUPPORT=y
+-CONFIG_USB_SUPPORT=y
 -CONFIG_USB_UHCI_HCD=m
-+CONFIG_USB_UHCI_HCD=y
++# CONFIG_USB_SUPPORT is not set
++# CONFIG_USB_UHCI_HCD is not set
  # CONFIG_USER_NS is not set
- CONFIG_USE_GENERIC_SMP_HELPERS=y
+-CONFIG_USE_GENERIC_SMP_HELPERS=y
++# CONFIG_USE_GENERIC_SMP_HELPERS is not set
  # CONFIG_VGACON_SOFT_SCROLLBACK is not set
  # CONFIG_VGASTATE is not set
  CONFIG_VGA_CONSOLE=y
 -CONFIG_VIA_RHINE=m
-+CONFIG_VIA_RHINE=y
- CONFIG_VIA_RHINE_MMIO=y
+-CONFIG_VIA_RHINE_MMIO=y
 -CONFIG_VIDEO_MEDIA=m
++# CONFIG_VIA_RHINE is not set
 +CONFIG_VIDEO_MEDIA=y
  # CONFIG_VIDEO_SELECT is not set
 -CONFIG_VIDEO_V4L2=m
 -CONFIG_VIDEO_V4L2_COMMON=m
-+CONFIG_VIDEO_V4L2=y
-+CONFIG_VIDEO_V4L2_COMMON=y
- CONFIG_VM86=y
- CONFIG_VM_EVENT_COUNTERS=y
+-CONFIG_VM86=y
+-CONFIG_VM_EVENT_COUNTERS=y
 -CONFIG_VORTEX=m
++# CONFIG_VIDEO_V4L2 is not set
++# CONFIG_VM86 is not set
++# CONFIG_VM_EVENT_COUNTERS is not set
 +CONFIG_VORTEX=y
  CONFIG_VT=y
  CONFIG_VT_CONSOLE=y
@@ -320,7 +421,6 @@
 -CONFIG_X86_32=y
 -CONFIG_X86_32_SMP=y
 -# CONFIG_X86_64 is not set
-+CONFIG_M586=y
  CONFIG_X86_BIOS_REBOOT=y
  # CONFIG_X86_CMPXCHG is not set
 -CONFIG_X86_CPU=y
@@ -340,12 +440,12 @@
  CONFIG_X86_L1_CACHE_SHIFT=7
 -CONFIG_X86_LOCAL_APIC=y
  # CONFIG_X86_LONGRUN is not set
- CONFIG_X86_MCE=y
+-CONFIG_X86_MCE=y
++# CONFIG_X86_MCE is not set
  # CONFIG_X86_MCE_NONFATAL is not set
  # CONFIG_X86_MCE_P4THERMAL is not set
 -CONFIG_X86_MINIMUM_CPU_FAMILY=3
-+CONFIG_X86_MINIMUM_CPU_FAMILY=4
- CONFIG_X86_MPPARSE=y
+-CONFIG_X86_MPPARSE=y
  # CONFIG_X86_MSR is not set
  # CONFIG_X86_P4_CLOCKMOD is not set
  # CONFIG_X86_PAE is not set
@@ -354,7 +454,7 @@
  CONFIG_X86_PC=y
  # CONFIG_X86_POWERNOW_K6 is not set
  # CONFIG_X86_POWERNOW_K7 is not set
-@@ -481,18 +461,182 @@
+@@ -481,18 +443,209 @@
  # CONFIG_X86_RDC321X is not set
  # CONFIG_X86_REBOOTFIXUPS is not set
  CONFIG_X86_RESERVE_LOW_64K=y
@@ -376,7 +476,7 @@
 +# CONFIG_X86_UP_APIC is not set
 +# CONFIG_CPU_FREQ is not set
 +# CONFIG_CPU_IDLE is not set
-+# CONFIG_X86_VERBOSE_BOOTUP is not set
++CONFIG_X86_VERBOSE_BOOTUP=y
 +# CONFIG_TCP_CONG_BIC is not set
 +# CONFIG_TCP_CONG_CUBIC is not set
 +# CONFIG_TCP_CONG_WESTWOOD is not set
@@ -544,3 +644,30 @@
 +CONFIG_TEXTSEARCH_KMP=y
 +CONFIG_TEXTSEARCH_BM=y
 +CONFIG_TEXTSEARCH_FSM=y
++CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
++CONFIG_BLK_DEV_LOOP=y
++CONFIG_COMPAT_VDSO=y
++CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
++CONFIG_HIDRAW=y
++CONFIG_IDE_ARCH_OBSOLETE_INIT=y
++CONFIG_M586MMX=y
++CONFIG_M586TSC=y
++CONFIG_M586=y
++CONFIG_MII=y
++CONFIG_MMU=y
++CONFIG_SERIAL_8250_CONSOLE=y
++CONFIG_SERIAL_8250_NR_UARTS=2
++CONFIG_SERIAL_8250_RUNTIME_UARTS=2
++CONFIG_SERIAL_8250=y
++CONFIG_SERIAL_CORE_CONSOLE=y
++CONFIG_SERIAL_CORE=y
++CONFIG_X86_32=y
++CONFIG_X86_ALIGNMENT_16=y
++CONFIG_X86_BSWAP=y
++CONFIG_X86_CMPXCHG=y
++CONFIG_X86_INTEL_USERCOPY=y
++CONFIG_X86_INVLPG=y
++CONFIG_X86_XADD=y
++CONFIG_X86=y
++CONFIG_ZONE_DMA_FLAG=1
++CONFIG_ZONE_DMA=y



More information about the tor-commits mailing list