Commit graph

9092 commits

Author SHA1 Message Date
John Crispin
3991526989 ramips: use kernel 3.6.6
## Booting image at 80800000 ...
   Image Name:   MIPS OpenWrt Linux-3.6.6
   Created:      2012-11-06  14:19:54 UTC

 System Control Status = 0x20440000
   Image Type:   MIPS Linux Kernel Image (lzma compressed)
   Data Size:    3560768 Bytes =  3.4 MB
   Load Address: 80000000
   Entry Point:  80000000
   Verifying Checksum ... OK
   Uncompressing Kernel Image ... OK
No initrd
## Transferring control to Linux (at address 80000000) ...
## Giving linux memsize in MB, 32

Starting kernel ...

[    0.000000] Linux version 3.6.6 (daniel@localhost.localdomain) (gcc version 4.6.4 20121001 (prerelease) (Linaro GCC 4.6-2012.10) ) #2 Tue Nov 6 16:19:48 IST 2012
[    0.000000] bootconsole [early0] enabled
[    0.000000] CPU revision is: 0001964c (MIPS 24KEc)
[    0.000000] Ralink RT3052 id:1 rev:2 running at 384.00 MHz
[    0.000000] Determined physical RAM map:
[    0.000000]  memory: 02000000 @ 00000000 (usable)
[    0.000000] Initrd not found or empty - disabling initrd
[    0.000000] Zone ranges:
[    0.000000]   Normal   [mem 0x00000000-0x01ffffff]
[    0.000000] Movable zone start for each node
[    0.000000] Early memory node ranges
[    0.000000]   node   0: [mem 0x00000000-0x01ffffff]
[    0.000000] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
[    0.000000] Primary data cache 16kB, 4-way, VIPT, no aliases, linesize 32 bytes
[    0.000000] Built 1 zonelists in Zone order, mobility grouping on.  Total pages: 8128
[    0.000000] Kernel command line:  console=ttyS1,57600n8 board=ALL0239-3G mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),6976k(rootfs),7872k@0x50000(firmware) rootfstype=squashfs,jffs2
[    0.000000] PID hash table entries: 128 (order: -3, 512 bytes)
[    0.000000] Dentry cache hash table entries: 4096 (order: 2, 16384 bytes)
[    0.000000] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes)
[    0.000000] __ex_table already sorted, skipping sort
[    0.000000] Writing ErrCtl register=0000c388
[    0.000000] Readback ErrCtl register=0000c388
[    0.000000] Memory: 27048k/32768k available (2015k kernel code, 5720k reserved, 498k data, 2676k init, 0k highmem)
[    0.000000] SLUB: Genslabs=9, HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1
[    0.000000] NR_IRQS:48
[    0.000000] console [ttyS1] enabled, bootconsole disabled
[    0.000000] console [ttyS1] enabled, bootconsole disabled
[    0.010000] Calibrating delay loop... 255.59 BogoMIPS (lpj=1277952)
[    0.090000] pid_max: default: 32768 minimum: 301
[    0.100000] Mount-cache hash table entries: 512
[    0.110000] NET: Registered protocol family 16
[    0.120000] MIPS: machine is Allnet ALL0239-3G
[    0.140000] bio: create slab <bio-0> at 0
[    0.150000] Switching to clocksource MIPS
[    0.160000] NET: Registered protocol family 2
[    0.170000] TCP established hash table entries: 1024 (order: 1, 8192 bytes)
[    0.180000] TCP bind hash table entries: 1024 (order: 0, 4096 bytes)
[    0.200000] TCP: Hash tables configured (established 1024 bind 1024)
[    0.210000] TCP: reno registered
[    0.220000] UDP hash table entries: 256 (order: 0, 4096 bytes)
[    0.230000] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes)
[    0.240000] NET: Registered protocol family 1
[    5.460000] squashfs: version 4.0 (2009/01/31) Phillip Lougher
[    5.470000] jffs2: version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc.
[    5.490000] msgmni has been set to 52
[    5.500000] io scheduler noop registered
[    5.510000] io scheduler deadline registered (default)
[    5.520000] Serial: 8250/16550 driver, 2 ports, IRQ sharing disabled
[    5.530000] serial8250: ttyS0 at MMIO 0x10000500 (irq = 13) is a 16550A
[    5.550000] serial8250: ttyS1 at MMIO 0x10000c00 (irq = 20) is a 16550A
[    5.560000] physmap platform flash device: 00800000 at bf000000
[    5.580000] physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. Manufacturer ID 0x000001 Chip ID 0x001000
[    5.600000] Amd/Fujitsu Extended Query Table at 0x0040
[    5.610000]   Amd/Fujitsu Extended Query version 1.3.
[    5.620000] number of CFI chips: 1
[    5.620000] 6 cmdlinepart partitions found on MTD device physmap-flash.0
[    5.640000] Creating 6 MTD partitions on "physmap-flash.0":
[    5.650000] 0x000000000000-0x000000030000 : "u-boot"
[    5.660000] 0x000000030000-0x000000040000 : "u-boot-env"
[    5.680000] 0x000000040000-0x000000050000 : "factory"
[    5.690000] 0x000000050000-0x000000130000 : "kernel"
[    5.700000] 0x000000130000-0x000000800000 : "rootfs"
[    5.710000] mtd: partition "rootfs" set to be root filesystem
[    5.730000] split_squashfs: error occured while reading from "physmap-flash.0"
[    5.740000] 0x000000050000-0x000000800000 : "firmware"
[    5.760000] ramips-wdt ramips-wdt: timeout value must be 0 < timeout <= 33, using 33
[    5.780000] TCP: cubic registered
[    5.780000] NET: Registered protocol family 17
[    5.790000] 8021q: 802.1Q VLAN Support v1.8
[    5.820000] Freeing unused kernel memory: 2676k freed
[    6.490000] Button Hotplug driver version 0.4.1
- preinit -
Press the [f] key and hit [enter] to enter failsafe mode
- regular preinit -
- init -

Please press Enter to activate this console. [   10.150000] Compat-drivers backport release: compat-drivers-2012-09-04-2-gddac993
[   10.170000] Backport based on wireless-testing.git master-2012-09-07
[   10.180000] compat.git: wireless-testing.git
[   10.210000] cfg80211: Calling CRDA to update world regulatory domain
[   10.230000] cfg80211: World regulatory domain updated:
[   10.240000] cfg80211:   (start_freq - end_freq @ bandwidth), (max_antenna_gain, max_eirp)
[   10.250000] cfg80211:   (2402000 KHz - 2472000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[   10.270000] cfg80211:   (2457000 KHz - 2482000 KHz @ 20000 KHz), (300 mBi, 2000 mBm)
[   10.280000] cfg80211:   (2474000 KHz - 2494000 KHz @ 20000 KHz), (300 mBi, 2000 mBm)
[   10.300000] cfg80211:   (5170000 KHz - 5250000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[   10.310000] cfg80211:   (5735000 KHz - 5835000 KHz @ 40000 KHz), (300 mBi, 2000 mBm)
[   10.430000] NET: Registered protocol family 10
[   10.760000] PPP generic driver version 2.4.2
[   10.820000] l2tp_core: L2TP core driver, V2.0
[   10.840000] l2tp_netlink: L2TP netlink interface
[   10.870000] sit: IPv6 over IPv4 tunneling driver
[   10.920000] ip_tables: (C) 2000-2006 Netfilter Core Team
[   11.060000] NET: Registered protocol family 24
[   11.090000] nf_conntrack version 0.5.0 (464 buckets, 1856 max)
[   11.230000] l2tp_ppp: PPPoL2TP kernel driver, V2.0
[   11.410000] ip6_tables: (C) 2000-2006 Netfilter Core Team
[   14.510000] device eth0.1 entered promiscuous mode
[   14.520000] device eth0 entered promiscuous mode
[   14.530000] IPv6: ADDRCONF(NETDEV_CHANGE): eth0.1: link becomes ready
[   14.550000] br-lan: port 1(eth0.1) entered forwarding state
[   14.560000] br-lan: port 1(eth0.1) entered forwarding state
[   16.560000] br-lan: port 1(eth0.1) entered forwarding state
[   16.600000] ramips-wdt: timeout value 60 must be 0 < timeout <= 33, using 33

BusyBox v1.19.4 (2012-11-06 13:40:37 IST) built-in shell (ash)
Enter 'help' for a list of built-in commands.

  _______                     ________        __
 |       |.-----.-----.-----.|  |  |  |.----.|  |_
 |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
 |_______||   __|_____|__|__||________||__|  |____|
          |__| W I R E L E S S   F R E E D O M
 -----------------------------------------------------
 BARRIER BREAKER (Bleeding Edge, r34079)
 -----------------------------------------------------
  * 1/2 oz Galliano         Pour all ingredients into
  * 4 oz cold Coffee        an irish coffee mug filled
  * 1 1/2 oz Dark Rum       with crushed ice. Stir.
  * 2 tsp. Creme de Cacao
 -----------------------------------------------------
root@OpenWrt:/#

SVN-Revision: 34111
2012-11-07 20:26:21 +00:00
John Crispin
480892226d ramips: add HAVE_CLK to Kconfig on all ramips socs
Signed-off-by: Daniel Golle <dgolle@allnet.de>

SVN-Revision: 34110
2012-11-07 20:26:04 +00:00
John Crispin
feb31be6af ramips: add linux-3.6 configuration for ramips socs
Signed-off-by: Daniel Golle <dgolle@allnet.de>

 create mode 100644 target/linux/ramips/rt288x/config-3.6
 create mode 100644 target/linux/ramips/rt305x/config-3.6
 create mode 100644 target/linux/ramips/rt3883/config-3.6

SVN-Revision: 34109
2012-11-07 20:25:55 +00:00
John Crispin
ca1fcaed5b ramips: port patches to linux-3.6
Signed-off-by: Daniel Golle <dgolle@allnet.de>

 create mode 100644 target/linux/ramips/patches-3.6/001-mips-add-cp0-compare-irq-function.patch
 create mode 100644 target/linux/ramips/patches-3.6/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
 create mode 100644 target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
 create mode 100644 target/linux/ramips/patches-3.6/100-mips-ralink-core.patch
 create mode 100644 target/linux/ramips/patches-3.6/101-rt288x_serial_driver_hack.patch
 create mode 100644 target/linux/ramips/patches-3.6/102-rt288x-pci-driver-hook.patch
 create mode 100644 target/linux/ramips/patches-3.6/103-ethernet.patch
 create mode 100644 target/linux/ramips/patches-3.6/104-ramips-watchdog-driver.patch
 create mode 100644 target/linux/ramips/patches-3.6/105-ramips-spi-driver.patch
 create mode 100644 target/linux/ramips/patches-3.6/105-usb_dwc_otg.patch
 create mode 100644 target/linux/ramips/patches-3.6/106-rt3883-pci-support.patch
 create mode 100644 target/linux/ramips/patches-3.6/200-rt3883-ehci-glue.patch
 create mode 100644 target/linux/ramips/patches-3.6/201-rt3883-ohci-glue.patch

SVN-Revision: 34108
2012-11-07 20:25:34 +00:00
Jonas Gorski
f2bb7754f5 bcm63xx: Enable endian check support for ath9k pci fixup.
Some ath9k caldatas need to be "endian checked".
This patch allows selecting wether to enable endian check or not.
Endian check is disabled by default.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 34105
2012-11-07 09:01:03 +00:00
Imre Kaloz
f2b75b517b fixup typos in the compex patch
SVN-Revision: 34104
2012-11-07 07:51:24 +00:00
Jonas Gorski
a50d121d8e linux: export bcm963xx_tag.h to userspace
Export bcm963xx_tag.h so mtd can use it without using kernel includes.

Signed-off-by: Catalin Patulea <cat@vv.carleton.ca>
[jonas.gorski@gmail.com: fixup bcm63xx patches, completely remove header
 from original location, refresh patches, use  a more matching patch
 number, port to 3.6]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

SVN-Revision: 34103
2012-11-06 15:21:46 +00:00
Luka Perkov
865933a0ec cns3xxx: refresh kernel config file
SVN-Revision: 34102
2012-11-06 11:16:43 +00:00
Luka Perkov
9a5c26d4ef cns3xxx: use files directory
SVN-Revision: 34101
2012-11-06 11:16:41 +00:00
John Crispin
7404e59bbd add OWRTDTB marker patch
SVN-Revision: 34100
2012-11-06 10:39:43 +00:00
John Crispin
3a1851964e add support for arv7525
SVN-Revision: 34097
2012-11-06 07:38:24 +00:00
Imre Kaloz
e141cbb0f9 refresh patches
SVN-Revision: 34095
2012-11-06 05:45:12 +00:00
Imre Kaloz
1a9dfd566e add default packages
SVN-Revision: 34094
2012-11-06 05:39:08 +00:00
Jonas Gorski
0722fd9c63 linux: generic: fix split_squashfs for 3.6
_read expects the retlen to be initialized to zero, which the mtd_read
helper does. So fix it by using mtd_read instead of calling _read directly.

SVN-Revision: 34093
2012-11-06 00:48:21 +00:00
Jonas Gorski
5bc7d81a20 bcm63xx: fix SPW303V images
SPW303V also needs its CRC fixed up since increasing the image size to
4MB to prevent the dual image mode of CFE.

SVN-Revision: 34091
2012-11-05 22:50:29 +00:00
Gabor Juhos
e92da5e7ae ar71xx: nuke ath79_set_usb_power_gpio helper
It is no longer used.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34088
2012-11-05 13:23:28 +00:00
Gabor Juhos
f2528b1792 ar71xx: use gpio_request_one instead of ath79_set_usb_power_gpio
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34087
2012-11-05 13:23:27 +00:00
Gabor Juhos
e8669729bc kernel: update linux 3.6 to 3.6.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34086
2012-11-05 13:22:09 +00:00
Imre Kaloz
d822ecfdf8 use the mainline machname for the compex boards
SVN-Revision: 34083
2012-11-05 11:38:23 +00:00
Gabor Juhos
a0dd47bbed ramips: enable USB power on the DIR-645
Closes #12422.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34082
2012-11-05 11:04:45 +00:00
Gabor Juhos
5e43b934fd linux/3.3: backport an upstream GPIO patch
The backported patch introduces new flags to
automatically export GPIOs when using the
convenience unctions gpio_request_one() or
gpio_request_array().

This will be used by ar71xx/ramips platforms.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34081
2012-11-05 11:04:43 +00:00
Gabor Juhos
829aaedcbf ramips: add restorefactory to default package set for ALL0239-3G and ALL0256N
Signed-off-by: Daniel Golle <dgolle@allnet.de>

SVN-Revision: 34078
2012-11-05 06:58:53 +00:00
Gabor Juhos
ed35253f4c ar71xx: don't use the unknown LED on the ZCN-1523-5 board
According to #12421, GPIO 1 controls the power
output on the unused lines of the LAN2 port.
Remove the LED definition in order to prevent
possible permanent hardware damage.

If someone needs that, the power-out feature can
be controlled via the GPIO sysfs interface.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34076
2012-11-04 22:08:54 +00:00
Gabor Juhos
1b744e1ca5 ar71xx: include mtd layout in the command line for ZCN-1523H-* boards
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34074
2012-11-04 21:12:20 +00:00
Gabor Juhos
b78a736dc2 ar71xx: add missing Makefile entry for the ZCN-1523H-{2,5} boards
Also add the missing ATH79_MACH_ZCN_1523H_5 symbol.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34072
2012-11-04 20:15:18 +00:00
Felix Fietkau
6040b1d29a linux-3.6: fix portability of some includes files in tools/ used on the host
SVN-Revision: 34068
2012-11-04 17:01:15 +00:00
John Crispin
05fbb370dc 3.6 is not the default yet
SVN-Revision: 34065
2012-11-03 13:29:44 +00:00
John Crispin
a9ad36b7f1 adds dts files and make devicetree images buildable
SVN-Revision: 34064
2012-11-02 20:07:47 +00:00
John Crispin
c8ae6dac56 update ase target for 3.6
SVN-Revision: 34063
2012-11-02 20:07:41 +00:00
John Crispin
dc8641f7fa add subtarget, as of 3.6 we dont seperate xway SoC
SVN-Revision: 34062
2012-11-02 20:07:36 +00:00
John Crispin
dd619da4fc adds 3.6 files, patches and config
SVN-Revision: 34061
2012-11-02 20:07:26 +00:00
John Crispin
736835343c move files/ -> files-3.3/
SVN-Revision: 34060
2012-11-02 20:07:02 +00:00
John Crispin
fa316620a7 prepare Makefile for 3.6
SVN-Revision: 34059
2012-11-02 20:06:51 +00:00
Gabor Juhos
0005762690 generic: make yaffs work on 3.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34054
2012-11-01 11:07:23 +00:00
Gabor Juhos
ffcb4b0fe1 generic: rename jffs2 patches
Make room for the upcoming yaffs patches.
No functional changes.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34053
2012-11-01 11:07:16 +00:00
Gabor Juhos
6c8c3ee77d generic: use mtd_* helpers in the yaffs code
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34046
2012-10-31 21:17:30 +00:00
Imre Kaloz
3c12bad276 move PCIe init to subsys init call
ARM Linux PCI/PCIe hardware intialization needs to occur before device_init
as it does not support hotplug.  I have modeled the cns3xxx PCIe init after
other ARM platforms.  Registering it early resolves resource issues occuring
during bus enumeration that occur when a device driver is linked static in
the kernel.

Instead of passing in a bitmask to enable the 2 available ports, link detect
is used to enable ports that have a valid link.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 34044
2012-10-31 20:16:53 +00:00
Gabor Juhos
07a762c4c5 kernel: update linux 3.6 to 3.6.5
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34042
2012-10-31 20:09:39 +00:00
Gabor Juhos
a4126685c6 generic: split yaffs-3.2-fix patch
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34041
2012-10-31 19:33:12 +00:00
Gabor Juhos
4baeb543f0 generic: replace yaffs-2.6.39 patch
Use backported upstream patches instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34032
2012-10-31 15:12:45 +00:00
Gabor Juhos
b888c2deab generic: replace yaffs mutex_fix patch
Use a backported patch instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34021
2012-10-30 21:16:24 +00:00
Gabor Juhos
d54782d01a generic: replace yaffs symlink fix patch
Use a backported patch instead.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34020
2012-10-30 21:16:23 +00:00
Gabor Juhos
9a8ccc1a08 generic: rename yaffs patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34019
2012-10-30 21:16:21 +00:00
Florian Fainelli
e14e4306c9 set earlyprintk UART to be the default Realview UART
SVN-Revision: 34015
2012-10-30 16:56:10 +00:00
Gabor Juhos
449f88df0f generic: fold yaffs_git_2010_10_20 patch to generic/files
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34013
2012-10-30 14:58:17 +00:00
Gabor Juhos
56190ed0fc generic: fold yaffs_cvs_2009_04_24 patch to generic/files
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34012
2012-10-30 14:58:13 +00:00
Gabor Juhos
7228a91a3b ar71xx: fix link speed between AR7242 and AR8327 on the RB750GL/RB751G boards
The default pll_1000 value had to be changed
in order to make it working.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33993
2012-10-29 17:24:30 +00:00
Gabor Juhos
e91dc2e5b3 target: refresh all target configs with kconfig.pl
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33987
2012-10-29 10:11:05 +00:00
Imre Kaloz
c0c69c974f add missing 3.6 symbols
SVN-Revision: 33986
2012-10-29 10:00:02 +00:00
Imre Kaloz
8e49dfe68a the uImage's filename will hardly change
SVN-Revision: 33985
2012-10-29 09:55:20 +00:00
Gabor Juhos
f7b2089704 generic: add more symbols for 3.6
Also refresh the config file with kconfig.pl.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33984
2012-10-29 09:08:59 +00:00
Gabor Juhos
e4db63fd64 ar71xx: add initial support for 3.6
The nand subtarget is not working yet.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33983
2012-10-28 19:52:02 +00:00
Gabor Juhos
87186c5ed4 kernel: update linux 3.6 to 3.6.4
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33982
2012-10-28 18:59:39 +00:00
Gabor Juhos
a6549ac1cb ar71xx: remove NO_AUTOINCR flag from the NAND drivers
The flag is not present in 3.6.
Also add compatibility patches for 3.3.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33971
2012-10-28 12:21:15 +00:00
Gabor Juhos
9a37cf7ec6 generic: fix crashlog patch for 3.6
kmsg_dump() uses an iterator to receive log buffer
content since 3.5. Change the 'crashlog_do_dump'
function in order to make it compatible with the
new version.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33970
2012-10-28 09:50:50 +00:00
Gabor Juhos
e2ec99889e ar71xx: ag71xx: fix build_skb arguments for 3.6
Also add a compatibility patch for 3.3

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33969
2012-10-27 17:11:06 +00:00
Gabor Juhos
7640a7cc24 generic: fix tcp_window_check patch for 3.6
Move the new entry to the end of the tcp_sysctl_table
array to fix the following error:

[    7.670000] sysctl table check failed: net/netfilter/nf_conntrack_tcp_max_retrans No data
[    7.680000] Call Trace:
[    7.680000] [<80273bc4>] dump_stack+0x8/0x34
[    7.680000] [<80128710>] __register_sysctl_table+0x374/0x3a8
[    7.690000] [<868d5034>] nf_conntrack_l4proto_unregister+0x158/0x1a0[nf_conntrack]
[    7.700000] [<868d50e4>] nf_conntrack_l4proto_register+0x68/0x21c[nf_conntrack]
[    7.710000] [<868b237c>] need_ipv4_conntrack+0x35c/0xb60[nf_conntrack_ipv4]
[    7.710000]
[    7.720000] nf_conntrack_l4proto_tcp4 :protocol register failed
[    7.720000] nf_conntrack_ipv4: can't register pernet ops
[    7.780000] nf_nat: Unknown symbol nf_nat_seq_adjust_hook (err 0)
[    7.790000] nf_nat: Unknown symbol need_ipv4_conntrack (err 0)
[    7.800000] iptable_nat: Unknown symbol nf_nat_packet (err 0)
[    7.810000] iptable_nat: Unknown symbol nf_nat_setup_info (err 0)
[    7.820000] iptable_nat: Unknown symbol nf_nat_icmp_reply_translation (err 0)
[    7.820000] iptable_nat: Unknown symbol need_ipv4_conntrack (err 0)
[    7.840000] ipt_MASQUERADE: Unknown symbol nf_nat_setup_info (err 0)
[    7.860000] nf_nat_ftp: Unknown symbol nf_nat_follow_master (err 0)
[    7.870000] nf_nat_ftp: Unknown symbol __nf_nat_mangle_tcp_packet (err 0)
[    7.890000] nf_nat_irc: Unknown symbol nf_nat_follow_master (err 0)
[    7.900000] nf_nat_irc: Unknown symbol __nf_nat_mangle_tcp_packet (err 0)

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33968
2012-10-27 15:42:25 +00:00
Imre Kaloz
50be09e1f7 instead of updating the whole file, just add the additional boards
SVN-Revision: 33966
2012-10-27 13:29:36 +00:00
Imre Kaloz
1a4f117398 rename erase size variables
SVN-Revision: 33964
2012-10-27 10:50:55 +00:00
Imre Kaloz
549d5a6e34 add support for Netgear WN802T
SVN-Revision: 33963
2012-10-27 10:48:22 +00:00
Imre Kaloz
cf7aed0a76 don't enforce rootfs location
SVN-Revision: 33962
2012-10-27 10:43:47 +00:00
Imre Kaloz
702fd5cdb5 generate images for the D-Link DWL-3150 as well
SVN-Revision: 33961
2012-10-27 09:42:58 +00:00
Gabor Juhos
3a86affcdd ar71xx: enable sysupgrade for the CAP4200AG board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33960
2012-10-27 08:55:42 +00:00
Gabor Juhos
e99d557c08 ar71xx: add profile and build image for the CAP4200AG
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33958
2012-10-27 08:55:40 +00:00
Gabor Juhos
9287e0c863 ar71xx: add user-space part for the CAP4200AG
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33957
2012-10-27 08:55:39 +00:00
Gabor Juhos
d54c9653e9 ar71xx: add support for the Senao CAP4200AG board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33956
2012-10-27 08:55:38 +00:00
Gabor Juhos
3b7cb4eb4a ar71xx: add ath79_wmac_disable_[25]ghz helpers
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33955
2012-10-27 08:55:37 +00:00
Gabor Juhos
e8fc46b7c5 generic: allow to disable [25]GHz support in ath9k via platform data
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33954
2012-10-27 08:55:36 +00:00
Gabor Juhos
c92998f9d9 generic: use mtd_read in myloader parser
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33952
2012-10-27 07:57:59 +00:00
Gabor Juhos
269872fe1e ar71xx: use mtd_read in wrt160nl_part
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33951
2012-10-27 07:57:58 +00:00
Gabor Juhos
973eda6077 ar71xx: use mtd_read in tplinkpart
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33950
2012-10-27 07:57:57 +00:00
Gabor Juhos
28f3adc2ed ar71xx: generate 4,8,16M images for the WPE72
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33949
2012-10-27 07:57:55 +00:00
Gabor Juhos
ee9376d153 generic: swconfig: use led_set_brightness in LED control code
The 'led_brightness_set' function has
been renamed to 'led_set_brightness'
in recent ernels. Use the new name and
add a compatibility patch for 3.3.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33946
2012-10-26 18:58:18 +00:00
Gabor Juhos
1127781d40 generic: add missing symbols for 3.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33945
2012-10-26 18:58:15 +00:00
Gabor Juhos
ff481a5518 ar71xx: reject TP-Link images containing a bootloader
The original TP-Link firmware images can be flashed via
the sysupgrade command, however those may contain a
bootloader. Flashing such an image via sysupgrade
bricks the board, and it can't be recovered without
a serial console.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33944
2012-10-26 18:58:13 +00:00
Gabor Juhos
db5eea6acd ramips: use correct key code for the RFKILL switch on the TEW-691GR
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33943
2012-10-26 18:53:44 +00:00
Florian Fainelli
c691d165c7 add 3.6 kernel configuration
SVN-Revision: 33942
2012-10-26 15:24:19 +00:00
Florian Fainelli
9af90aa80c add missing 6345 clock bits patch to 3.6 patches
SVN-Revision: 33941
2012-10-26 15:24:14 +00:00
Florian Fainelli
fad6afdf06 add some more 3.6 config symbols
SVN-Revision: 33940
2012-10-26 15:24:10 +00:00
Florian Fainelli
8d69af7c9f add preliminary support for 3.6 kernel
SVN-Revision: 33936
2012-10-25 21:16:51 +00:00
Hauke Mehrtens
6a699a8ae8 brcm47xx: check for .ELF header in partition parser
The image format for the wgt634u is different from the normal format.
Without this patch the partition parser detects a 128kb bigger
partition after every update.

This closes #11420

Thank you b.sander for the patch.

SVN-Revision: 33935
2012-10-25 19:49:20 +00:00
Hauke Mehrtens
d4ef5de604 kernel: add PCI id 14e4:4350 to ssb
* 14e4:4350 is found on a Broadcom BCM43222.
* remove some warnings when using a BCM43222.

SVN-Revision: 33929
2012-10-25 15:50:47 +00:00
Felix Fietkau
1e2962e63c kernel: add a few missing config symbols for x86. added to generic config because of dependencies, so that kernel_menuconfig does not remove them again
SVN-Revision: 33923
2012-10-25 15:11:45 +00:00
Felix Fietkau
5591188ac3 kernel: refresh config files using kconfig.pl
SVN-Revision: 33922
2012-10-25 15:11:40 +00:00
Hauke Mehrtens
dca633f1c8 kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma
* do some misc enhancements to the flash drivers for bcm47xx

SVN-Revision: 33920
2012-10-25 14:33:47 +00:00
Florian Fainelli
dea2da55df fix Ethernet DMA for 636x and 6328 after r33916
SVN-Revision: 33918
2012-10-25 11:54:41 +00:00
Florian Fainelli
917670922b add support for the Dynalink RTA770BW board
This board id is used by the Siemens Gigaset SE515 router.

SVN-Revision: 33917
2012-10-24 21:25:22 +00:00
Florian Fainelli
bdfcbb8bee make BCM6345 Ethernet DMA changes runtime checks
The semantics of the DMA engine are identical, we just have a couple of
special case handling.

SVN-Revision: 33916
2012-10-24 21:25:10 +00:00
Florian Fainelli
df6f9072ab ARM: fix XZ decompressor stub build failure on strstr()
SVN-Revision: 33915
2012-10-24 15:57:31 +00:00
Florian Fainelli
b5c27880ee fixup generic 3.6 kernel config
It was not meant to be committed as-is in r33911

SVN-Revision: 33914
2012-10-24 15:57:24 +00:00
Florian Fainelli
a6bfca90b0 fix IFF_NO_IP_ALIGN bitmask to contain only 1 bit set
This issue got introduced while porting the patch over 3.6 in r33897

SVN-Revision: 33913
2012-10-24 13:23:20 +00:00
Florian Fainelli
7e856e5a97 make all 3.6 patches apply and build
SVN-Revision: 33911
2012-10-24 13:05:22 +00:00
Florian Fainelli
4afb91a12f swconfig: get rid of the NLA_PUT_* macros
Upstream kernel 3.6 has removed this usage, use the plain functions directly as
intended.

SVN-Revision: 33906
2012-10-24 13:05:04 +00:00
Jo-Philipp Wich
f600ec5b3b x86: allow both old and new grub signatures in sysupgrade
SVN-Revision: 33898
2012-10-23 16:34:00 +00:00
Imre Kaloz
949b46d13d linux 3.6 support (work in progress)
SVN-Revision: 33897
2012-10-23 12:21:34 +00:00
Jonas Gorski
0d2cf5f9e3 kernel: move the bcma fallback sprom fix to generic
bcm63xx needs the bcma fallback sprom fix, too.

SVN-Revision: 33896
2012-10-23 10:57:49 +00:00
Jonas Gorski
0cc4bed41c add support for Comtrend AR5381u.
Router: Comtrend AR5381u.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
[jogo: fix subject, indentation in patch]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

SVN-Revision: 33895
2012-10-23 10:57:47 +00:00
Jonas Gorski
d73871fb18 add support for Comtrend AR5387un.
Router: Comtrend AR5387un.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
[jogo: fix subject, indentation in patch]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

SVN-Revision: 33894
2012-10-23 10:57:44 +00:00
Jonas Gorski
e93725a743 add support for HomeStation ADB P.DG A4001N.
Router: HomeStation ADB P.DG A4001N.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
[jogo: fix subject, indentation in patch]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

SVN-Revision: 33893
2012-10-23 10:57:39 +00:00
Felix Fietkau
95e642632a x86: correct image magic for grub2 images
Sysupgrade broke on x86 when grub2 superceded grub.  This patch
corrects tha magic_word to be expected in grub2 combined images.

Signed-off-by: Russell Senior <russell@personaltelco.net>

SVN-Revision: 33890
2012-10-22 16:06:29 +00:00
Florian Fainelli
61686a1514 add back support for BCM6345 Ethernet DMA engine
SVN-Revision: 33889
2012-10-22 12:57:22 +00:00
Florian Fainelli
eeed82c04e fix clocks bits for BCM6345
SVN-Revision: 33888
2012-10-22 12:57:14 +00:00
Florian Fainelli
ca25e61c6c refresh 3.3 patches
SVN-Revision: 33887
2012-10-21 21:30:30 +00:00
Jonas Gorski
e6171dfb2c Add F@ST2604 board support.
Add Sagem F@ST2604 board support.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 33886
2012-10-21 14:35:06 +00:00
Gabor Juhos
f1f388d527 ar71xx: rw2458n - fix flash parts
See #12338. Redwave rw2458 has uboot, not redboot.

Signed-off-by: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33867
2012-10-19 18:32:49 +00:00
Gabor Juhos
b530d9d2b3 ramips: disable 5GHz on the built in wireless mac of the TEW-69{1,2}GR
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33864
2012-10-19 17:42:22 +00:00
Gabor Juhos
6ca2970e4b ramips: add profile and build image for the TEW-691GR board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33852
2012-10-18 07:23:13 +00:00
Gabor Juhos
21180e29f7 ramips: add user-space support for TEW-691GR
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33851
2012-10-18 07:23:12 +00:00
Gabor Juhos
25d53c4c28 ramips: rt3883: add initial support for the TRENDnet TEW-691GR board
No wireless support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33850
2012-10-18 07:23:11 +00:00
Gabor Juhos
462a53c367 ramips: add profile and build image for the TEW-692GR board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33849
2012-10-18 07:23:10 +00:00
Gabor Juhos
d3c368c324 ramips: add user-space support for the TEW-692GR board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33847
2012-10-18 07:23:07 +00:00
Gabor Juhos
7f8b7207c9 ramips: rt3883: add initial support for TRENDnet TEW-692GR board
No wireless support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33846
2012-10-18 07:23:06 +00:00
Gabor Juhos
bf9ae9432b ramips: add profile and build image for the DIR-645 board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33845
2012-10-18 07:23:04 +00:00
Gabor Juhos
06edafd079 ramips: add user space support for the DIR-645
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33844
2012-10-18 07:23:03 +00:00
Gabor Juhos
d1a253a2fd ramips: rt3883: add inital support for the DIR-645 board
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33843
2012-10-18 07:23:02 +00:00
Gabor Juhos
e962c16a88 ramips: use get_magic_long in sysupgrade image check
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33842
2012-10-18 07:23:00 +00:00
Gabor Juhos
0045449b1b generic: add driver for the the RTL8367R{B,-VB} switches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33839
2012-10-18 07:22:56 +00:00
Felix Fietkau
96fa602499 ixp4xx: add sysupgrade support
Signed-off-by: Tim Harvey <tharvey@gateworks.com>

 target/linux/ixp4xx/base-files/lib/ixp4xx.sh           |   25 ++
 target/linux/ixp4xx/base-files/lib/upgrade/platform.sh |  156 +++++++++++++++++
 target/linux/ixp4xx/image/Makefile                     |   11 +
 3 files changed, 192 insertions(+)

SVN-Revision: 33828
2012-10-17 22:03:46 +00:00
Felix Fietkau
879b7a7a9b cns3xxx: update FIQ header file and disable RWFO
Update header file appropriately and disable read for ownership

Note that the FIQ support implements a workaround that provides a performance
boost over the traditional upstream workaround which ensures cache lines
are exclusive on driver CPU using 'read for ownership'.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

 target/linux/cns3xxx/config-3.3                                |    2 +-
 target/linux/cns3xxx/patches-3.3/460-cns3xxx_fiq_support.patch |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

SVN-Revision: 33827
2012-10-17 22:03:37 +00:00
John Crispin
6993e19532 drop GPIODEV platform code
SVN-Revision: 33825
2012-10-17 21:53:37 +00:00
Gabor Juhos
7a72f01a72 ar71xx: merge machine support patches
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33820
2012-10-17 18:27:50 +00:00
Gabor Juhos
2e1bc1e15b ar71xx: also use the ath79_set_ar934x_eth_cfg helper for DB120
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33819
2012-10-17 18:27:48 +00:00
Gabor Juhos
31387947c8 ar71xx: use the ath79_set_ar934x_eth_cfg helper in machine setup routines
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33818
2012-10-17 18:27:47 +00:00
Gabor Juhos
5ffc08e3dc ar71xx: add a helper function for setting up ETH_CFG register on AR934x
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33817
2012-10-17 18:27:45 +00:00
Gabor Juhos
35a91a4fe8 ar71xx: OM2P-HS sysupgrade support
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33803
2012-10-17 08:26:05 +00:00
Gabor Juhos
c5a32cfc92 ar71xx: add support for the OpenMesh OM2P-HS board
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33800
2012-10-17 08:26:01 +00:00
Florian Fainelli
254d851d8a nuport-mac: various fixes
- properly check for the link up condition in the phylib adjust callback
- do not assign skb->dev, eth_type_trans() already does it
- handle skb allocation failures in the refill path

SVN-Revision: 33780
2012-10-15 21:03:57 +00:00
Florian Fainelli
60ecd5fe04 merge the RDC R-321x target as a subtarget of x86
SVN-Revision: 33779
2012-10-15 18:54:34 +00:00
Gabor Juhos
f1283d8583 ar71xx: fix sysupgrade for jjPlus JWAP003
[juhosg: change commit message]

Signed-off-by: Artur Wronowski <arteqw@gmail.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33769
2012-10-14 16:24:26 +00:00
Gabor Juhos
1944f7b916 ar71xx: ew-dorin: added ethernet switch configuration
Signed-off-by: embedded wireless GmbH <info at embeddedwireless.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33768
2012-10-14 16:24:25 +00:00
Gabor Juhos
62ab2b0da6 ar71xx: unbreak building images for OpenMesh OM2P/OM2P-LC
Commit r33248 introduced a regression by passing the board name plus
'board=' in the third argument. The board name string has to be put
into the image as identifier of the image type.

[juhosg: fix OpenMesh template instead of use of string substitution]

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 33767
2012-10-14 16:24:22 +00:00
Florian Fainelli
e4bebad4f7 add Actiontec PK5000 LEDs
Also share them between the GT701 and the PK5000.

Patch from Daniel Gimpelevich.

SVN-Revision: 33756
2012-10-13 17:47:45 +00:00
Florian Fainelli
d78371f5c0 vlynq: rework probing and clocking setup
Handle the different vlynq device versions, and make the vlynq code more
in line with the original vlynq implementation.

Patch from Daniel Gimpelevich.

SVN-Revision: 33755
2012-10-13 17:47:36 +00:00
Florian Fainelli
0f04f7479c remove the squashfs alignement define
Patch from Daniel Gimpelevich.

SVN-Revision: 33754
2012-10-13 17:47:30 +00:00
Florian Fainelli
ec4e61e558 handle LOADER_MAGIC2 in ar7part
This is required for Actiontec PK5000 devices. Path from Daniel Gimpelevich.

SVN-Revision: 33753
2012-10-13 17:47:25 +00:00
Florian Fainelli
e5a65db1b5 increase the flash resource size to its maximum value
CFI detection will reduce the resource size to its real value.

Patch from Daniel Gimpelevich.

SVN-Revision: 33752
2012-10-13 17:47:20 +00:00
Florian Fainelli
7205421c5b reinstate the fixed PHY fallback for devices with undetectable switches
At least devices without a switch present on the MDIO bus still get a valid
link and work as expected (such as the Linksys WAG54Gv2).

SVN-Revision: 33751
2012-10-13 17:47:14 +00:00
Florian Fainelli
3794a6a9dd enable mvswitch driver
And fix the default network configuration to create the required VLANs.

Patch from Daniel Gimpelevich.

SVN-Revision: 33750
2012-10-13 17:47:09 +00:00
Florian Fainelli
99598d2473 use the second available LED to encore mode boot states
Patch from Daniel Gimpelevich.

SVN-Revision: 33749
2012-10-13 17:47:04 +00:00
Florian Fainelli
31c324f451 use wpad-mini instead of hostapd
SVN-Revision: 33744
2012-10-13 17:46:32 +00:00
Imre Kaloz
c24df51736 add support for new Option modules (GTM66xxWFS/GTM67xxWFS)
Add new device ID's for the hso driver as well as usb storage

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 33743
2012-10-13 06:58:42 +00:00
Jo-Philipp Wich
4cfd3dc8ed x86/kvm_guest: enable PCIE support
SVN-Revision: 33741
2012-10-12 16:51:31 +00:00
Florian Fainelli
e7b2a4170c copy initramfs kernel to bin directory
SVN-Revision: 33726
2012-10-11 15:45:24 +00:00
John Crispin
ba6751058b gpiodev/gpioctl RIP
SVN-Revision: 33725
2012-10-11 11:58:09 +00:00
Imre Kaloz
88a740ff80 fix (really this time) laguna UART config
Properly terminate the correct platform resource for laguna UARTs

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 33721
2012-10-11 09:51:35 +00:00
Imre Kaloz
9b22ca8042 The Gateworks System Controller (GSC) is an i2c device that provides system level monitoring and control of Gateworks boards. It is used on several product families spanning several different target architectures (ixp4xx, cns3xxx, davinci).
Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 33720
2012-10-11 07:59:06 +00:00
Imre Kaloz
31c2f1a4d2 fix non terminated uart resources for laguna
Resolves crashes when probing multiple serial devices

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 33719
2012-10-11 07:47:27 +00:00
Florian Fainelli
bc3b111cfd generate vmlinux.srec and vmlinux.bin from srec2bin
Useful for loading the kernel into RAM using ADAM2/PSPBoot.

SVN-Revision: 33718
2012-10-11 06:45:07 +00:00
Felix Fietkau
d0ec348ded kernel: fq_codel: dont reinit flow state
Keep fq_codel flow state around after queue empty.

SVN-Revision: 33687
2012-10-10 11:54:31 +00:00
Felix Fietkau
f933719138 kernel: dont delay acks after ECN CE
Bugfix from linux head - don't delay acks from ECN congestion
experienced in some situations.

SVN-Revision: 33686
2012-10-10 11:54:27 +00:00