diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/x86/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/x86/config-2.6.25 | 69 |
2 files changed, 52 insertions, 19 deletions
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index ddc06c5..9943210 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 SUBTARGETS=generic -LINUX_VERSION:=2.6.25 +LINUX_VERSION:=2.6.25.1 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci diff --git a/target/linux/x86/config-2.6.25 b/target/linux/x86/config-2.6.25 index 94e89e5..51dda38 100644 --- a/target/linux/x86/config-2.6.25 +++ b/target/linux/x86/config-2.6.25 @@ -15,14 +15,18 @@ CONFIG_AC97_BUS=m # CONFIG_ALIM1535_WDT is not set # CONFIG_ALIM7101_WDT is not set # CONFIG_APRICOT is not set +CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y +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_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_OPROFILE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_AT1700 is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set @@ -41,16 +45,16 @@ CONFIG_BLK_DEV_IDE=y CONFIG_BLK_DEV_IDEDISK=y CONFIG_BLK_DEV_IDEDMA=y CONFIG_BLK_DEV_IDEDMA_PCI=y +CONFIG_BLK_DEV_IDEDMA_SFF=y CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_PLATFORM is not set # CONFIG_BLK_DEV_QD65XX is not set CONFIG_BLK_DEV_SC1200=y # CONFIG_BLK_DEV_UMC8672 is not set CONFIG_BLK_DEV_VIA82CXXX=y # CONFIG_BLK_DEV_XD is not set CONFIG_BOUNCE=y -# CONFIG_BT_HCIUART_LL is not set # CONFIG_BT_HIDP is not set +CONFIG_CLASSIC_RCU=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_COMPAT_VDSO=y # CONFIG_CPU5_WDT is not set @@ -69,12 +73,17 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_TABLE=y # CONFIG_CPU_IDLE is not set +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AES_586=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_GF128MUL=m +# CONFIG_CRYPTO_SALSA20_586 is not set CONFIG_CRYPTO_TWOFISH_586=m # CONFIG_CS5535_GPIO is not set # CONFIG_CS89x0 is not set # CONFIG_DCDBAS is not set CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set CONFIG_DEVPORT=y @@ -86,6 +95,7 @@ CONFIG_DOUBLEFAULT=y CONFIG_DUMMY_CONSOLE=y CONFIG_E1000=m # CONFIG_E1000E is not set +# CONFIG_E1000E_ENABLED is not set # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_E1000_NAPI=y CONFIG_EARLY_PRINTK=y @@ -101,6 +111,7 @@ CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_EUROTECH_WDT is not set CONFIG_EXT2_FS=y +CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FS_POSIX_ACL=y CONFIG_GENERIC_BUG=y @@ -109,22 +120,30 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_GENERIC_CMOS_UPDATE=y # CONFIG_GENERIC_CPU is not set +# CONFIG_GENERIC_GPIO is not set CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_ISA_DMA=y +# CONFIG_GENERIC_LOCKBREAK is not set CONFIG_GENERIC_PENDING_IRQ=y # CONFIG_GENERIC_TIME_VSYSCALL is not set # CONFIG_HANGCHECK_TIMER is not set CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y -CONFIG_HIBERNATION_SMP_POSSIBLE=y +CONFIG_HAVE_IDE=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 is not set CONFIG_HID=y -# CONFIG_HIDRAW is not set CONFIG_HID_SUPPORT=y # CONFIG_HIGHMEM4G is not set # CONFIG_HIGHMEM64G is not set # CONFIG_HIGH_RES_TIMERS is not set # CONFIG_HPET_TIMER is not set +# CONFIG_HP_WATCHDOG is not set CONFIG_HT_IRQ=y # CONFIG_HUGETLBFS is not set CONFIG_HWMON=m @@ -153,9 +172,9 @@ CONFIG_I2C_CHARDEV=m CONFIG_IDE=y CONFIG_IDEPCI_PCIBUS_ORDER=y CONFIG_IDE_ARCH_OBSOLETE_INIT=y -# CONFIG_IDE_ARM is not set CONFIG_IDE_GENERIC=y # CONFIG_IDE_PROC_FS is not set +# CONFIG_IGB is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_INPUT=y # CONFIG_INPUT_EVDEV is not set @@ -165,7 +184,17 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_IOMMU_HELPER is not set +CONFIG_IO_DELAY_0X80=y +# CONFIG_IO_DELAY_0XED is not set +# CONFIG_IO_DELAY_NONE is not set +CONFIG_IO_DELAY_TYPE_0X80=0 +CONFIG_IO_DELAY_TYPE_0XED=1 +CONFIG_IO_DELAY_TYPE_NONE=3 +CONFIG_IO_DELAY_TYPE_UDELAY=2 +# CONFIG_IO_DELAY_UDELAY is not set # CONFIG_IP1000 is not set +# CONFIG_IPWIRELESS is not set CONFIG_IRQBALANCE=y CONFIG_ISA=y CONFIG_ISAPNP=y @@ -180,12 +209,17 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KPROBES is not set CONFIG_KTIME_SCALAR=y # CONFIG_LANCE is not set +# CONFIG_LATENCYTOP is not set # CONFIG_LEDS_ALIX is not set +# CONFIG_LEDS_CLEVO_MAIL is not set CONFIG_LEDS_NET48XX=m # CONFIG_LEDS_WRAP is not set CONFIG_LOCK_KERNEL=y +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m CONFIG_M386=y # CONFIG_M486 is not set # CONFIG_M586 is not set @@ -201,6 +235,7 @@ CONFIG_MATH_EMULATION=y # CONFIG_MCYRIXIII is not set # CONFIG_MDA_CONSOLE is not set # CONFIG_MEFFICEON is not set +# CONFIG_MEMSTICK is not set # CONFIG_MGEODEGX1 is not set # CONFIG_MGEODE_LX is not set CONFIG_MICROCODE=y @@ -265,6 +300,7 @@ CONFIG_MTRR=y # CONFIG_MWINCHIP2 is not set # CONFIG_MWINCHIP3D is not set # CONFIG_MWINCHIPC6 is not set +CONFIG_NAMESPACES=y CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m CONFIG_NETDEV_1000=y @@ -272,15 +308,12 @@ CONFIG_NET_VENDOR_3COM=y # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_SMC is not set CONFIG_NOHIGHMEM=y -# CONFIG_NO_HZ is not set CONFIG_NR_CPUS=8 -CONFIG_NR_QUICK=1 CONFIG_NSC_GPIO=m CONFIG_NVRAM=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PARAVIRT_GUEST is not set # CONFIG_PATA_CS5536 is not set -# CONFIG_PATA_NS87415 is not set CONFIG_PC8736x_GPIO=m # CONFIG_PC87413_WDT is not set CONFIG_PCCARD=m @@ -307,8 +340,9 @@ CONFIG_PNP=y # CONFIG_PNPACPI is not set # CONFIG_PNPBIOS is not set # CONFIG_PNP_DEBUG is not set -CONFIG_PREEMPT_BKL=y -CONFIG_QUICKLIST=y +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_R6040 is not set # CONFIG_RELOCATABLE is not set CONFIG_RTC=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -319,6 +353,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_SC1200_WDT=m # CONFIG_SC520_WDT is not set # CONFIG_SCC is not set +# CONFIG_SCHED_HRTICK is not set CONFIG_SCHED_MC=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_SCHED_SMT=y @@ -333,11 +368,7 @@ CONFIG_SCx200_I2C_SCL=12 CONFIG_SCx200_I2C_SDA=13 CONFIG_SCx200_WDT=m CONFIG_SEMAPHORE_SLEEPERS=y -# CONFIG_SENSORS_ADT7470 is not set -# CONFIG_SENSORS_F71882FG is not set -# CONFIG_SENSORS_F75375S is not set # CONFIG_SENSORS_FSCHMD is not set -# CONFIG_SENSORS_I5K_AMB is not set CONFIG_SENSORS_PC87360=m # CONFIG_SERIAL_8250_CS is not set # CONFIG_SERIAL_8250_EXTENDED is not set @@ -354,7 +385,6 @@ CONFIG_SLABINFO=y CONFIG_SMP=y # CONFIG_SMSC37B787_WDT is not set CONFIG_SND_AC97_CODEC=m -# CONFIG_SND_CS5530 is not set CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_CMEDIA=y @@ -369,23 +399,23 @@ CONFIG_SND_HDA_INTEL=m # CONFIG_SND_HDA_POWER_SAVE is not set CONFIG_SND_INTEL8X0=m # CONFIG_SND_SC6000 is not set +# CONFIG_SND_SIS7019 is not set CONFIG_SOFT_WATCHDOG=m # CONFIG_SONYPI is not set CONFIG_SPARSEMEM_STATIC=y # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set CONFIG_SSB_POSSIBLE=y CONFIG_STOP_MACHINE=y -CONFIG_SUSPEND_SMP_POSSIBLE=y CONFIG_SYSVIPC_SYSCTL=y # CONFIG_TCIC is not set # CONFIG_TELCLOCK is not set +# CONFIG_THERMAL is not set # CONFIG_TICK_ONESHOT is not set # CONFIG_TOSHIBA is not set # CONFIG_TYPHOON is not set CONFIG_UID16=y # CONFIG_USBPCWATCHDOG is not set CONFIG_USB_EHCI_HCD=m -CONFIG_USB_EHCI_SPLIT_ISO=y # 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 @@ -401,6 +431,7 @@ CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y CONFIG_VIA_RHINE_NAPI=y # CONFIG_VIDEO_SELECT is not set +CONFIG_VIDEO_V4L2_COMMON=m # CONFIG_VIRTUALIZATION is not set CONFIG_VM86=y CONFIG_VM_EVENT_COUNTERS=y @@ -412,6 +443,7 @@ CONFIG_VT_CONSOLE=y # CONFIG_WDT is not set CONFIG_X86=y CONFIG_X86_32=y +CONFIG_X86_32_SMP=y # CONFIG_X86_64 is not set # CONFIG_X86_BIGSMP is not set CONFIG_X86_BIOS_REBOOT=y @@ -446,6 +478,7 @@ CONFIG_X86_PC=y # CONFIG_X86_POWERNOW_K7 is not set # CONFIG_X86_POWERNOW_K8 is not set CONFIG_X86_PPRO_FENCE=y +# CONFIG_X86_RDC321X is not set # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_X86_SMP=y # CONFIG_X86_SPEEDSTEP_CENTRINO is not set |