From 4641de3a52a50f531332eddffc43bafad2a84652 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 13 Oct 2005 16:18:32 +0000 Subject: [PATCH] linux-oz-2.6: Update dev branch to 2.6.14-rc4. Add cpufreq for pxa25x and enable for c7x0 --- .../.mtn2git_empty | 0 .../add-elpp-stuff.patch | 0 .../add-oz-release-string.patch | 0 .../connectplus-remove-ide-HACK.patch | 0 .../defconfig-c7x0 | 149 +++++++++--------- .../defconfig-collie | 0 .../defconfig-cxx00 | 0 .../defconfig-ipaq-pxa270 | 0 .../defconfig-poodle | 0 .../defconfig-tosa | 0 .../dtl1_cs-add-socket-revE.patch | 0 .../pxa-serial-hack.patch | 0 ...-mm1.bb => linux-openzaurus_2.6.14-rc4.bb} | 34 +--- 13 files changed, 80 insertions(+), 103 deletions(-) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/.mtn2git_empty (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/add-elpp-stuff.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/add-oz-release-string.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/connectplus-remove-ide-HACK.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-c7x0 (94%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-collie (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-cxx00 (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-ipaq-pxa270 (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-poodle (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/defconfig-tosa (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/dtl1_cs-add-socket-revE.patch (100%) rename packages/linux/{linux-openzaurus-2.6.14-rc2-mm1 => linux-openzaurus-2.6.14-rc4}/pxa-serial-hack.patch (100%) rename packages/linux/{linux-openzaurus_2.6.14-rc2-mm1.bb => linux-openzaurus_2.6.14-rc4.bb} (75%) diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.14-rc4/.mtn2git_empty similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/.mtn2git_empty rename to packages/linux/linux-openzaurus-2.6.14-rc4/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.14-rc4/add-elpp-stuff.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-elpp-stuff.patch rename to packages/linux/linux-openzaurus-2.6.14-rc4/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.14-rc4/add-oz-release-string.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/add-oz-release-string.patch rename to packages/linux/linux-openzaurus-2.6.14-rc4/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.14-rc4/connectplus-remove-ide-HACK.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/connectplus-remove-ide-HACK.patch rename to packages/linux/linux-openzaurus-2.6.14-rc4/connectplus-remove-ide-HACK.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0 similarity index 94% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-c7x0 rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0 index 9dd7c230e7..acdfc822a3 100644 --- a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.13-rc3-mm1 -# Sun Jul 24 18:32:14 2005 +# Linux kernel version: 2.6.14-rc4 +# Thu Oct 13 14:55:00 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -22,23 +22,19 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y 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_INITRAMFS_SOURCE="" 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 @@ -101,6 +97,8 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_PXA_IDP is not set CONFIG_PXA_SHARPSL=y # CONFIG_MACH_HX2750 is not set +CONFIG_PXA_SHARPSL_25x=y +# CONFIG_PXA_SHARPSL_27x is not set # CONFIG_MACH_POODLE is not set CONFIG_MACH_CORGI=y CONFIG_MACH_SHEPHERD=y @@ -145,13 +143,11 @@ CONFIG_PCMCIA_IOCTL=y # # PC-card bridges # -# CONFIG_TCIC is not set CONFIG_PCMCIA_PXA2XX=y # # Kernel Features # -# CONFIG_SMP is not set CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set @@ -161,6 +157,7 @@ CONFIG_FLATMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set CONFIG_ALIGNMENT_TRAP=y # @@ -168,9 +165,24 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 " +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 debug" # CONFIG_XIP_KERNEL is not set +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA25x=y + # # Floating point emulation # @@ -223,8 +235,8 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_TUNNEL is not set -# CONFIG_IP_TCPDIAG is not set -# CONFIG_IP_TCPDIAG_IPV6 is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y @@ -241,6 +253,7 @@ CONFIG_INET6_TUNNEL=m CONFIG_IPV6_TUNNEL=m CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set +# CONFIG_NETFILTER_NETLINK is not set # # IP: Netfilter Configuration @@ -248,11 +261,14 @@ CONFIG_NETFILTER=y CONFIG_IP_NF_CONNTRACK=m # CONFIG_IP_NF_CT_ACCT is not set # CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set CONFIG_IP_NF_CT_PROTO_SCTP=m CONFIG_IP_NF_FTP=m CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set CONFIG_IP_NF_TFTP=m CONFIG_IP_NF_AMANDA=m +# CONFIG_IP_NF_PPTP is not set CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m @@ -276,13 +292,16 @@ CONFIG_IP_NF_MATCH_OWNER=m CONFIG_IP_NF_MATCH_ADDRTYPE=m CONFIG_IP_NF_MATCH_REALM=m CONFIG_IP_NF_MATCH_SCTP=m +# CONFIG_IP_NF_MATCH_DCCP is not set CONFIG_IP_NF_MATCH_COMMENT=m CONFIG_IP_NF_MATCH_HASHLIMIT=m +# CONFIG_IP_NF_MATCH_STRING is not set CONFIG_IP_NF_FILTER=m # CONFIG_IP_NF_TARGET_REJECT is not set CONFIG_IP_NF_TARGET_LOG=m CONFIG_IP_NF_TARGET_ULOG=m CONFIG_IP_NF_TARGET_TCPMSS=m +# CONFIG_IP_NF_TARGET_NFQUEUE is not set CONFIG_IP_NF_NAT=m CONFIG_IP_NF_NAT_NEEDED=y # CONFIG_IP_NF_TARGET_MASQUERADE is not set @@ -300,6 +319,7 @@ CONFIG_IP_NF_MANGLE=m # CONFIG_IP_NF_TARGET_DSCP is not set # CONFIG_IP_NF_TARGET_MARK is not set # CONFIG_IP_NF_TARGET_CLASSIFY is not set +# CONFIG_IP_NF_TARGET_TTL is not set CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_TARGET_NOTRACK is not set CONFIG_IP_NF_ARPTABLES=m @@ -326,10 +346,18 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m # CONFIG_IP6_NF_TARGET_LOG is not set +# CONFIG_IP6_NF_TARGET_REJECT is not set +# CONFIG_IP6_NF_TARGET_NFQUEUE is not set CONFIG_IP6_NF_MANGLE=m # CONFIG_IP6_NF_TARGET_MARK is not set +# CONFIG_IP6_NF_TARGET_HL is not set CONFIG_IP6_NF_RAW=m +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + # # SCTP Configuration (EXPERIMENTAL) # @@ -353,11 +381,6 @@ CONFIG_NET_CLS_ROUTE=y # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_KGDBOE is not set -# CONFIG_NETPOLL is not set -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HAMRADIO is not set CONFIG_IRDA=m @@ -436,7 +459,11 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m -# CONFIG_IEEE80211 is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +# CONFIG_IEEE80211_CRYPT_CCMP is not set +# CONFIG_IEEE80211_CRYPT_TKIP is not set # # Device Drivers @@ -542,7 +569,6 @@ CONFIG_BLK_DEV_LOOP=y # 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 # @@ -585,6 +611,7 @@ CONFIG_IDE_GENERIC=y # # SCSI device support # +# CONFIG_RAID_ATTRS is not set CONFIG_SCSI=m CONFIG_SCSI_PROC_FS=y @@ -612,6 +639,7 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set # # SCSI low-level drivers @@ -655,6 +683,11 @@ CONFIG_NETDEVICES=y # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set +# +# PHY device support +# +# CONFIG_PHYLIB is not set + # # Ethernet (10 or 100Mbit) # @@ -708,7 +741,6 @@ CONFIG_PCMCIA_SPECTRUM=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_CS=m -# CONFIG_ACX is not set CONFIG_NET_WIRELESS=y # @@ -735,11 +767,12 @@ CONFIG_PPP_ASYNC=m # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set CONFIG_PPP_BSDCOMP=m -# CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # # ISDN subsystem @@ -771,6 +804,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_CORGI=y +# CONFIG_KEYBOARD_SPITZ is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -860,11 +894,9 @@ CONFIG_I2C_ALGOBIT=y # CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set -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 # # Miscellaneous I2C Chip support @@ -886,6 +918,7 @@ CONFIG_I2C_ISA=m # Hardware Monitoring support # CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set # CONFIG_SENSORS_ADM1021 is not set # CONFIG_SENSORS_ADM1025 is not set # CONFIG_SENSORS_ADM1026 is not set @@ -914,6 +947,7 @@ CONFIG_HWMON=y # CONFIG_SENSORS_SMSC47M1 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set # CONFIG_SENSORS_W83L785TS is not set # CONFIG_SENSORS_W83627HF is not set # CONFIG_SENSORS_W83627EHF is not set @@ -923,6 +957,10 @@ CONFIG_HWMON=y # Misc devices # +# +# Multimedia Capabilities Port drivers +# + # # SoC drivers # @@ -1001,12 +1039,6 @@ CONFIG_BACKLIGHT_DEVICE=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_BACKLIGHT_CORGI=y -# -# Speakup console speech -# -# CONFIG_SPEAKUP is not set -CONFIG_SPEAKUP_DEFAULT="none" - # # Sound # @@ -1021,11 +1053,6 @@ CONFIG_SOUND=y # Open Sound System # CONFIG_SOUND_PRIME=y -# CONFIG_SOUND_BT878 is not set -# CONFIG_SOUND_FUSION is not set -# CONFIG_SOUND_CS4281 is not set -# CONFIG_SOUND_SONICVIBES is not set -# CONFIG_SOUND_TRIDENT is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set CONFIG_SOUND_OSS=y @@ -1086,12 +1113,11 @@ CONFIG_USB_SL811_CS=m # # USB Device Class drivers # -CONFIG_USB_AUDIO=m +# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set # # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem # -CONFIG_USB_MIDI=m CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m @@ -1108,6 +1134,7 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR09 is not set # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set # # USB Input Devices @@ -1164,30 +1191,14 @@ CONFIG_USB_KAWETH=m CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m - -# -# USB Host-to-Host Cables -# -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_GENESYS=y -CONFIG_USB_NET1080=y -CONFIG_USB_PL2301=y -CONFIG_USB_KC2190=y - -# -# Intelligent USB Devices/Gadgets -# -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_ZAURUS=y -CONFIG_USB_CDCETHER=y - -# -# USB Network Adapters -# -CONFIG_USB_AX8817X=y +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m # CONFIG_USB_ZD1201 is not set CONFIG_USB_MON=y @@ -1253,7 +1264,6 @@ CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m CONFIG_USB_LED=m CONFIG_USB_CYTHERM=m -# CONFIG_USB_GOTEMP is not set CONFIG_USB_PHIDGETKIT=m CONFIG_USB_PHIDGETSERVO=m CONFIG_USB_IDMOUSE=m @@ -1304,14 +1314,9 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -# CONFIG_REISER4_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set - -# -# XFS support -# # CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -1320,11 +1325,6 @@ CONFIG_INOTIFY=y CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set - -# -# Caches -# -# CONFIG_FSCACHE is not set # CONFIG_FUSE_FS is not set # @@ -1348,12 +1348,9 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_PROC_FS=y CONFIG_SYSFS=y -# CONFIG_DEVPTS_FS_XATTR is not set CONFIG_TMPFS=y -# CONFIG_TMPFS_XATTR is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y -# CONFIG_CONFIGFS_FS is not set # CONFIG_RELAYFS_FS is not set # @@ -1361,7 +1358,6 @@ 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 @@ -1547,6 +1543,7 @@ CONFIG_CRYPTO_TEST=m # Library routines # CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set CONFIG_CRC32=y CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-collie similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-collie rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-cxx00 rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-ipaq-pxa270 similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-ipaq-pxa270 rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-ipaq-pxa270 diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-poodle similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-poodle rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-tosa similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/defconfig-tosa rename to packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.14-rc4/dtl1_cs-add-socket-revE.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/dtl1_cs-add-socket-revE.patch rename to packages/linux/linux-openzaurus-2.6.14-rc4/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.14-rc2-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.14-rc4/pxa-serial-hack.patch similarity index 100% rename from packages/linux/linux-openzaurus-2.6.14-rc2-mm1/pxa-serial-hack.patch rename to packages/linux/linux-openzaurus-2.6.14-rc4/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb b/packages/linux/linux-openzaurus_2.6.14-rc4.bb similarity index 75% rename from packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb rename to packages/linux/linux-openzaurus_2.6.14-rc4.bb index c3dc5c8c5a..2574ff9b95 100644 --- a/packages/linux/linux-openzaurus_2.6.14-rc2-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.14-rc4.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r2" +PR = "r0" DEFAULT_PREFERENCE = "-1" @@ -10,38 +10,16 @@ DEFAULT_PREFERENCE = "-1" # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \ # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ -# Recently Merged -# ${RPSRC}/corgi_cleanup-r0.patch;patch=1 \ -# ${RPSRC}/poodle_cleanup-r0.patch;patch=1 \ -# ${RPSRC}/poodle_mmc-r0.patch;patch=1 \ -# ${RPSRC}/scoop_collie_fix-r0.patch;patch=1 \ -# ${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \ -# ${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \ -# ${RPSRC}/sharpsl_ts-r6.patch;patch=1 \ -# ${RPSRC}/sharpsl_bl-r5a.patch;patch=1 \ -# ${RPSRC}/spitzkbd-r3.patch;patch=1 \ -# ${RPSRC}/spitz_base-r17.patch;patch=1 \ -# ${RPSRC}/sharpsl_bl_miss-r0.patch;patch=1 \ -# ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \ -# ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ -# ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ -# ${RPSRC}/pcmcia_really_resume-r0.patch;patch=1 \ - # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom +# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc2.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ - ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ - ${RPSRC}/corgi_addinclude-r0.patch;patch=1 \ - ${RPSRC}/collie_scoop_fix1-r0.patch;patch=1 \ - ${RPSRC}/scoop_susres-r1.patch;patch=1 \ - ${RPSRC}/poodle_irda-r0.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc4.bz2;patch=1 \ ${RPSRC}/pxa_i2c_fixes-r1.patch;patch=1 \ ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \ ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ ${RPSRC}/corgi_pm-r4.patch;patch=1 \ ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \ ${RPSRC}/spitz_pm-r4.patch;patch=1 \ @@ -49,13 +27,15 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ - ${RPSRC}/pxa_irda-r4.patch;patch=1 \ + ${RPSRC}/pxa_irda-r5.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ + ${RPSRC}/poodle_irda-r0.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/sharpsl_bl_kick-r1.patch;patch=1 \ ${RPSRC}/corgi_snd-r10.patch;patch=1 \ + ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r21.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \ -- 2.39.5