diff options
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/add-elpp-stuff.patch) | 98 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/add-oz-release-string.patch) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0) | 519 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-collie) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-ipaq-pxa-2.6) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-poodle) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-spitz) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch (renamed from packages/linux/linux-openzaurus-2.6.12-mm1/pxa-serial-hack.patch) | 0 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb (renamed from packages/linux/linux-openzaurus_2.6.12-mm1.bb) | 31 |
12 files changed, 339 insertions, 309 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/.mtn2git_empty +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch index 9462506321..85d07191b9 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/add-elpp-stuff.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-elpp-stuff.patch @@ -3,8 +3,10 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- /dev/null -+++ linux-2.6.12/Documentation/fb/elpp.txt +Index: linux-2.6.12/Documentation/fb/elpp.txt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.12/Documentation/fb/elpp.txt 2005-07-24 18:21:08.000000000 +0100 @@ -0,0 +1,181 @@ + + ELPP, The Enhanced Linux Progress Patch v1.0 @@ -187,8 +189,10 @@ + ----------------------------------------- + Comments, queries and changes welcome at: + Matthias Kunze <elpp at foofighter.de> ---- linux-2.6.12/drivers/video/Kconfig~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/Kconfig +Index: linux-2.6.12/drivers/video/Kconfig +=================================================================== +--- linux-2.6.12.orig/drivers/video/Kconfig 2005-07-24 18:20:46.000000000 +0100 ++++ linux-2.6.12/drivers/video/Kconfig 2005-07-24 18:21:08.000000000 +0100 @@ -108,6 +108,11 @@ This is particularly important to one driver, matroxfb. If unsure, say N. @@ -201,8 +205,10 @@ config FB_CIRRUS tristate "Cirrus Logic support" depends on FB && (ZORRO || PCI) ---- linux-2.6.12/drivers/video/console/Makefile~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/console/Makefile +Index: linux-2.6.12/drivers/video/console/Makefile +=================================================================== +--- linux-2.6.12.orig/drivers/video/console/Makefile 2005-07-24 18:20:21.000000000 +0100 ++++ linux-2.6.12/drivers/video/console/Makefile 2005-07-24 18:21:08.000000000 +0100 @@ -31,6 +31,8 @@ obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o endif @@ -212,8 +218,10 @@ obj-$(CONFIG_FB_STI) += sticore.o font.o # Targets that kbuild needs to know about ---- /dev/null -+++ linux-2.6.12/drivers/video/console/elpp.c +Index: linux-2.6.12/drivers/video/console/elpp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.12/drivers/video/console/elpp.c 2005-07-24 18:21:08.000000000 +0100 @@ -0,0 +1,685 @@ + +/* @@ -900,8 +908,10 @@ + return -1; +} + ---- linux-2.6.12/drivers/video/console/fbcon.c~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/console/fbcon.c +Index: linux-2.6.12/drivers/video/console/fbcon.c +=================================================================== +--- linux-2.6.12.orig/drivers/video/console/fbcon.c 2005-07-24 18:20:21.000000000 +0100 ++++ linux-2.6.12/drivers/video/console/fbcon.c 2005-07-24 18:21:08.000000000 +0100 @@ -91,6 +91,9 @@ #include <asm/machdep.h> #include <asm/setup.h> @@ -921,7 +931,7 @@ static signed char con2fb_map_boot[MAX_NR_CONSOLES]; static int logo_height; static int logo_lines; -@@ -1002,6 +1005,19 @@ +@@ -996,6 +999,19 @@ softback_top = 0; } } @@ -941,7 +951,7 @@ } static void fbcon_deinit(struct vc_data *vc) -@@ -2002,6 +2018,12 @@ +@@ -1996,6 +2012,12 @@ logo_shown = fg_console; /* This is protected above by initmem_freed */ fb_show_logo(info); @@ -954,8 +964,10 @@ update_region(vc, vc->vc_origin + vc->vc_size_row * vc->vc_top, vc->vc_size_row * (vc->vc_bottom - ---- /dev/null -+++ linux-2.6.12/drivers/video/console/symbols_16x16.c +Index: linux-2.6.12/drivers/video/console/symbols_16x16.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.12/drivers/video/console/symbols_16x16.c 2005-07-24 18:21:08.000000000 +0100 @@ -0,0 +1,123 @@ + +#include <linux/font.h> @@ -1080,8 +1092,10 @@ + 0 +}; + ---- linux-2.6.12/drivers/video/fbmem.c~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/fbmem.c +Index: linux-2.6.12/drivers/video/fbmem.c +=================================================================== +--- linux-2.6.12.orig/drivers/video/fbmem.c 2005-07-24 18:20:37.000000000 +0100 ++++ linux-2.6.12/drivers/video/fbmem.c 2005-07-24 18:21:08.000000000 +0100 @@ -360,7 +360,13 @@ fb_logo.depth = 4; else @@ -1119,18 +1133,22 @@ info->fbops->fb_imageblit(info, &image); } ---- linux-2.6.12/drivers/video/logo/Makefile~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/logo/Makefile -@@ -12,6 +12,7 @@ - obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o +Index: linux-2.6.12/drivers/video/logo/Makefile +=================================================================== +--- linux-2.6.12.orig/drivers/video/logo/Makefile 2005-07-24 18:20:21.000000000 +0100 ++++ linux-2.6.12/drivers/video/logo/Makefile 2005-07-24 18:22:21.000000000 +0100 +@@ -13,6 +13,7 @@ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o + obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o +obj-$(CONFIG_FB_ELPP) += logo_linux_elpp.o # How to generate logo's ---- linux-2.6.12/drivers/video/logo/logo.c~add-elpp-stuff.patch -+++ linux-2.6.12/drivers/video/logo/logo.c +Index: linux-2.6.12/drivers/video/logo/logo.c +=================================================================== +--- linux-2.6.12.orig/drivers/video/logo/logo.c 2005-07-24 18:20:21.000000000 +0100 ++++ linux-2.6.12/drivers/video/logo/logo.c 2005-07-24 18:23:04.000000000 +0100 @@ -14,6 +14,10 @@ #include <linux/stddef.h> #include <linux/module.h> @@ -1142,18 +1160,18 @@ #ifdef CONFIG_M68K #include <asm/setup.h> #endif -@@ -33,6 +37,8 @@ - extern const struct linux_logo logo_superh_mono; +@@ -34,6 +38,8 @@ extern const struct linux_logo logo_superh_vga16; extern const struct linux_logo logo_superh_clut224; + extern const struct linux_logo logo_m32r_clut224; +extern const struct linux_logo logo_linux_elpp; +extern struct elpp_struct elpp; const struct linux_logo *fb_find_logo(int depth) -@@ -97,6 +103,12 @@ - /* SuperH Linux logo */ - logo = &logo_superh_clut224; +@@ -102,6 +108,12 @@ + /* M32R Linux logo */ + logo = &logo_m32r_clut224; #endif +#ifdef CONFIG_FB_ELPP + if( elpp.logo != (void*)0) @@ -1164,8 +1182,10 @@ } return logo; } ---- /dev/null -+++ linux-2.6.12/drivers/video/logo/logo_linux_elpp.c +Index: linux-2.6.12/drivers/video/logo/logo_linux_elpp.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.12/drivers/video/logo/logo_linux_elpp.c 2005-07-24 18:21:08.000000000 +0100 @@ -0,0 +1,25669 @@ +/* + * DO NOT EDIT THIS FILE! @@ -26836,8 +26856,10 @@ + .data = logo_linux_elpp_data +}; + ---- /dev/null -+++ linux-2.6.12/include/linux/elpp.h +Index: linux-2.6.12/include/linux/elpp.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.12/include/linux/elpp.h 2005-07-24 18:21:08.000000000 +0100 @@ -0,0 +1,96 @@ + +/* @@ -26935,9 +26957,11 @@ +extern struct elpp_struct elpp; + +#endif ---- linux-2.6.12/init/main.c~add-elpp-stuff.patch -+++ linux-2.6.12/init/main.c -@@ -107,6 +107,12 @@ +Index: linux-2.6.12/init/main.c +=================================================================== +--- linux-2.6.12.orig/init/main.c 2005-07-24 18:20:41.000000000 +0100 ++++ linux-2.6.12/init/main.c 2005-07-24 18:21:08.000000000 +0100 +@@ -108,6 +108,12 @@ enum system_states system_state; EXPORT_SYMBOL(system_state); @@ -26950,7 +26974,7 @@ /* * Boot command-line arguments */ -@@ -521,6 +527,9 @@ +@@ -523,6 +529,9 @@ signals_init(); /* rootfs populating might need page-writeback */ page_writeback_init(); @@ -26960,7 +26984,7 @@ #ifdef CONFIG_PROC_FS proc_root_init(); #endif -@@ -562,7 +571,7 @@ +@@ -564,7 +573,7 @@ } (*call)(); @@ -26969,7 +26993,7 @@ msg = NULL; if (preempt_count() != count) { msg = "preemption imbalance"; -@@ -629,6 +638,13 @@ +@@ -631,6 +640,13 @@ #ifdef CONFIG_SMP int i; diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch index 22a6fd3943..22a6fd3943 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/add-oz-release-string.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 index b6b7cbc17d..b993f2ac26 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-c7x0 @@ -1,14 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12-mm1 -# Tue Jun 21 19:04:43 2005 +# Linux kernel version: 2.6.13-rc3-mm1 +# Sun Jul 24 18:32:14 2005 # CONFIG_ARM=y CONFIG_MMU=y CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_CALIBRATE_DELAY=y -CONFIG_GENERIC_IOMAP=y # # Code maturity level options @@ -28,12 +27,18 @@ CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set + +# +# Class Based Kernel Resource Management +# +# CONFIG_CKRM is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y # CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y +# CONFIG_DELAY_ACCT is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -86,6 +91,7 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_VERSATILE is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set # # Intel PXA2xx Implementations @@ -147,6 +153,7 @@ CONFIG_PCMCIA_PXA2XX=y # # CONFIG_SMP is not set CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -190,215 +197,7 @@ CONFIG_PM=y CONFIG_APM=y # -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y -# CONFIG_DEBUG_DRIVER is not set - -# -# Memory Technology Devices (MTD) -# -CONFIG_MTD=y -# CONFIG_MTD_DEBUG is not set -# CONFIG_MTD_CONCAT is not set -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_AFS_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=y -CONFIG_MTD_BLOCK=y -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set - -# -# RAM/ROM/Flash chip drivers -# -# CONFIG_MTD_CFI is not set -# CONFIG_MTD_JEDECPROBE is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -# CONFIG_MTD_RAM is not set -CONFIG_MTD_ROM=y -# CONFIG_MTD_ABSENT is not set - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_SHARP_SL=y -# CONFIG_MTD_PLATRAM is not set - -# -# Self-contained MTD device drivers -# -# CONFIG_MTD_SLRAM is not set -# CONFIG_MTD_PHRAM is not set -# CONFIG_MTD_MTDRAM is not set -# CONFIG_MTD_BLKMTD is not set -# CONFIG_MTD_BLOCK2MTD is not set - -# -# Disk-On-Chip Device Drivers -# -# CONFIG_MTD_DOC2000 is not set -# CONFIG_MTD_DOC2001 is not set -# CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y -# CONFIG_MTD_NAND_H1900 is not set -CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_SHARPSL=y -# CONFIG_MTD_NAND_NANDSIM is not set - -# -# Parallel port support -# -# CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_UB is not set -# CONFIG_BLK_DEV_RAM is not set -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_INITRAMFS_SOURCE="" -# CONFIG_CDROM_PKTCDVD is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECS=y -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -# CONFIG_BLK_DEV_IDEFLOPPY is not set -# CONFIG_BLK_DEV_IDESCSI is not set -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -# CONFIG_IDE_ARM is not set -# CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set -# CONFIG_BLK_DEV_HD is not set - -# -# SCSI device support -# -CONFIG_SCSI=m -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set -CONFIG_CHR_DEV_SG=m -# CONFIG_CHR_DEV_SCH is not set - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set - -# -# SCSI Transport Attributes -# -# CONFIG_SCSI_SPI_ATTRS is not set -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set - -# -# SCSI low-level drivers -# -# CONFIG_SCSI_SATA is not set -# CONFIG_SCSI_DEBUG is not set - -# -# PCMCIA SCSI adapter support -# -# CONFIG_PCMCIA_AHA152X is not set -# CONFIG_PCMCIA_FDOMAIN is not set -# CONFIG_PCMCIA_NINJA_SCSI is not set -# CONFIG_PCMCIA_QLOGIC is not set -# CONFIG_PCMCIA_SYM53C500 is not set - -# -# Multi-device support (RAID and LVM) -# -# CONFIG_MD is not set - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# Networking support +# Networking # CONFIG_NET=y @@ -408,10 +207,13 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y +CONFIG_XFRM=y +CONFIG_XFRM_USER=m # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set @@ -423,17 +225,8 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_TUNNEL is not set # CONFIG_IP_TCPDIAG is not set # CONFIG_IP_TCPDIAG_IPV6 is not set - -# -# TCP congestion control -# -# CONFIG_TCP_CONG_BIC is not set -# CONFIG_TCP_CONG_WESTWOOD is not set -# CONFIG_TCP_CONG_HTCP is not set -# CONFIG_TCP_CONG_HSTCP is not set -# CONFIG_TCP_CONG_HYBLA is not set -# CONFIG_TCP_CONG_VEGAS is not set -# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y # # IP: Virtual Server Configuration @@ -536,8 +329,6 @@ CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m # CONFIG_IP6_NF_TARGET_MARK is not set CONFIG_IP6_NF_RAW=m -CONFIG_XFRM=y -CONFIG_XFRM_USER=m # # SCTP Configuration (EXPERIMENTAL) @@ -555,10 +346,6 @@ CONFIG_XFRM_USER=m # CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set - -# -# QoS and/or fair queueing -# # CONFIG_NET_SCHED is not set CONFIG_NET_CLS_ROUTE=y @@ -650,6 +437,218 @@ CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m # CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Memory Technology Devices (MTD) +# +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_SHARP_SL=y +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_H1900 is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_UB is not set +# CONFIG_BLK_DEV_RAM is not set +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CDROM_PKTCDVD is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_BLK_DEV_IDESCSI is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +CONFIG_SCSI=m +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_CHR_DEV_OSST=m +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set + +# +# SCSI Transport Attributes +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set + +# +# SCSI low-level drivers +# +# CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_DEBUG is not set + +# +# PCMCIA SCSI adapter support +# +# CONFIG_PCMCIA_AHA152X is not set +# CONFIG_PCMCIA_FDOMAIN is not set +# CONFIG_PCMCIA_NINJA_SCSI is not set +# CONFIG_PCMCIA_QLOGIC is not set +# CONFIG_PCMCIA_SYM53C500 is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -775,7 +774,8 @@ CONFIG_TOUCHSCREEN_CORGI=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=m # # Hardware I/O ports @@ -826,7 +826,6 @@ CONFIG_SA1100_RTC=y # # Ftape, the floppy tape device driver # -# CONFIG_DRM is not set # # PCMCIA character devices @@ -860,11 +859,28 @@ CONFIG_I2C_ISA=m # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set +# CONFIG_I2C_SENSOR is not set # -# Hardware Sensors Chip support +# Miscellaneous I2C Chip support # -# CONFIG_I2C_SENSOR is not set +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set @@ -890,28 +906,13 @@ CONFIG_I2C_ISA=m # CONFIG_SENSORS_LM92 is not set # CONFIG_SENSORS_MAX1619 is not set # CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set - -# -# Other I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_HWMON_DEBUG_CHIP is not set # # Misc devices @@ -934,7 +935,6 @@ CONFIG_VIDEO_DEV=m # # Video Adapters # -# CONFIG_CONFIG_TUNER_MULTI_I2C is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set @@ -997,6 +997,12 @@ CONFIG_BACKLIGHT_DEVICE=y CONFIG_BACKLIGHT_CORGI=y # +# Speakup console speech +# +# CONFIG_SPEAKUP is not set +CONFIG_SPEAKUP_DEFAULT="none" + +# # Sound # CONFIG_SOUND=y @@ -1118,8 +1124,11 @@ CONFIG_USB_POWERMATE=m CONFIG_USB_MTOUCH=m # CONFIG_USB_ITMTOUCH is not set CONFIG_USB_EGALAX=m +# CONFIG_USB_YEALINK is not set CONFIG_USB_XPAD=m CONFIG_USB_ATI_REMOTE=m +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set # # USB Imaging devices @@ -1174,7 +1183,7 @@ CONFIG_USB_CDCETHER=y # CONFIG_USB_AX8817X=y # CONFIG_USB_ZD1201 is not set -CONFIG_USB_MON=m +CONFIG_USB_MON=y # # USB port drivers @@ -1242,6 +1251,7 @@ CONFIG_USB_CYTHERM=m CONFIG_USB_PHIDGETKIT=m CONFIG_USB_PHIDGETSERVO=m CONFIG_USB_IDMOUSE=m +# CONFIG_USB_LD is not set # CONFIG_USB_TEST is not set # @@ -1288,11 +1298,10 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -CONFIG_FS_MBCACHE=y # CONFIG_REISER4_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y +# CONFIG_FS_POSIX_ACL is not set # # XFS support @@ -1333,7 +1342,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_PROC_FS=y CONFIG_SYSFS=y -# CONFIG_DEVFS_FS is not set # CONFIG_DEVPTS_FS_XATTR is not set CONFIG_TMPFS=y # CONFIG_TMPFS_XATTR is not set @@ -1347,6 +1355,7 @@ CONFIG_RAMFS=y # # CONFIG_ADFS_FS is not set # CONFIG_AFFS_FS is not set +# CONFIG_ASFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie index 9f51b61169..9f51b61169 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 index 8b41380784..8b41380784 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-ipaq-pxa-2.6 +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle index 42a851dd5f..42a851dd5f 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz index ed5010d5c8..ed5010d5c8 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa index c7eba4a337..c7eba4a337 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch index a2dbce3325..a2dbce3325 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch index ee761b75ad..ee761b75ad 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/pxa-serial-hack.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc3-mm1/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb index b8f64bed78..293d65d1f6 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc3-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r6" +PR = "r0" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -18,23 +18,19 @@ BASRC = "http://www.orca.cx/zaurus/patches" # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \ # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \ - -# ${RPSRC}/corgi_kbd1-r1.patch;patch=1 \ -# ${RPSRC}/sharpsl_mapprom-r1.patch;patch=1 \ +# ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \ # Patches submitted upstream are towards top of this list SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12/2.6.12-mm1/2.6.12-mm1.bz2;patch=1 \ - ${RPSRC}/machtype_update-r1.patch;patch=1 \ - ${RPSRC}/collie_typofix-r0.patch;patch=1 \ - ${RPSRC}/rmk_armsmp_fix-r0.patch;patch=1 \ - ${RPSRC}/corgi_tspmu-r1.patch;patch=1 \ - ${RPSRC}/oprofile_trace-r3.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm1/2.6.13-rc3-mm1.bz2;patch=1 \ + ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r0.patch;patch=1 \ + ${RPSRC}/preempt_nwfpe1-r0.patch;patch=1 \ ${RPSRC}/w100_core-r0.patch;patch=1 \ ${RPSRC}/w100_corgi-r0.patch;patch=1 \ ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \ - ${RPSRC}/corgi_kbd_susres-r0.patch;patch=1 \ + ${RPSRC}/corgi_kbd_susres-r1.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ @@ -51,24 +47,25 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/pxa-i2c-func-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_base-r17.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_bl-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_pcmcia-r0.patch;patch=1 \ - ${RPSRC}/ipaq/pxa_keys-r0.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \ + ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \ ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_test1-r1.patch;patch=1 \ ${DOSRC}/tosa-detection-r0.patch;patch=1 \ ${BASRC}/spitz-detection-r0.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r4.patch;patch=1 \ - ${DOSRC}/tc6393_nand-r5.patch;patch=1 \ + ${DOSRC}/tc6393_nand-r6.patch;patch=1 \ ${DOSRC}/tosa-machine-base-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r5.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \ ${DOSRC}/tc6393fb-r6.patch;patch=1 \ ${DOSRC}/tosa-power-r5.patch;patch=1 \ ${DOSRC}/tosa-mmc-r3.patch;patch=1 \ ${DOSRC}/tosa-udc-r3.patch;patch=1 \ ${DOSRC}/tosa-irda-r2.patch;patch=1 \ - ${DOSRC}/tosa-lcd-r2.patch;patch=1 \ + ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-bl-r4.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ |