Merge with OpenWRT upstream

[8devices]

Merge with OpenWRT upstream. As usual I am trying to follow "merge every two months" rule. Last merging point was about 2012/04/04, next merge will happen on 2012/06/06

[8devices]

Merging done. Tagging as 'carambola/v2.1-rc1'.

[ghost]

[ 0.000000] Linux version 3.3.8 (evka@Evka) (gcc version 4.7.1 20120402 (prerelease) (Linaro GCC 4.7-2012.04) ) #11 Thu Jun 7 15:39:15 EEST 2012 [ 0.000000] prom: fw_arg0=00000001, fw_arg1=01f6efb0, fw_arg2=01f6f3b0, fw_arg3=00000000

[ 0.000000] bootconsole [early0] enabled [ 0.000000] CPU revision is: 0001964c (MIPS 24KEc) [ 0.000000] Ralink RT3350 id:1 rev:2 running at 320.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 PFN ranges: [ 0.000000] Normal 0x00000000 -> 0x00002000 [ 0.000000] Movable zone start PFN for each node [ 0.000000] Early memory PFN ranges [ 0.000000] 0: 0x00000000 -> 0x00002000 [ 0.000000] On node 0 totalpages: 8192 [ 0.000000] free_area_init_node: node 0, pgdat 80257720, node_mem_map 81000000 [ 0.000000] Normal zone: 64 pages used for memmap [ 0.000000] Normal zone: 0 pages reserved [ 0.000000] Normal zone: 8128 pages, LIFO batch:0 [ 0.000000] pcpu-alloc: s0 r0 d32768 u32768 alloc=1*32768 [ 0.000000] pcpu-alloc: [0] 0 [ 0.000000] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 8128 [ 0.000000] Kernel command line: board=CARAMBOLA console=ttyS1,115200 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] 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] Writing ErrCtl register=00034320 [ 0.000000] Readback ErrCtl register=00034320 [ 0.000000] Memory: 29796k/32768k available (1942k kernel code, 2972k reserved, 457k data, 172k 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.010000] Calibrating delay loop... 212.58 BogoMIPS (lpj=1062912) [ 0.090000] pid_max: default: 32768 minimum: 301 [ 0.090000] Mount-cache hash table entries: 512 [ 0.100000] NET: Registered protocol family 16 [ 0.110000] MIPS: machine is CARAMBOLA [ 0.110000] XXX carambola_init():107 [ 0.130000] bio: create slab at 0 [ 0.140000] Switching to clocksource MIPS [ 0.150000] NET: Registered protocol family 2 [ 0.160000] IP route cache hash table entries: 1024 (order: 0, 4096 bytes) [ 0.170000] TCP established hash table entries: 1024 (order: 1, 8192 bytes) [ 0.170000] TCP bind hash table entries: 1024 (order: 0, 4096 bytes) [ 0.180000] TCP: Hash tables configured (established 1024 bind 1024) [ 0.190000] TCP reno registered [ 0.190000] UDP hash table entries: 256 (order: 0, 4096 bytes) [ 0.200000] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) [ 0.200000] NET: Registered protocol family 1 [ 0.260000] squashfs: version 4.0 (2009/01/31) Phillip Lougher [ 0.260000] JFFS2 version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc. [ 0.270000] msgmni has been set to 58 [ 0.280000] io scheduler noop registered [ 0.280000] io scheduler deadline registered (default) [ 0.290000] Serial: 8250/16550 driver, 2 ports, IRQ sharing disabled [ 0.300000] serial8250: ttyS0 at MMIO 0x10000500 (irq = 13) is a 16550A [ 0.300000] serial8250: ttyS1 at MMIO 0x10000c00 (irq = 20) is a 16550A [ 0.310000] physmap platform flash device: 00800000 at bf000000 [ 0.320000] physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. Manufacturer ID 0x0000c2 Chip ID 0x0022c9 [ 0.330000] Amd/Fujitsu Extended Query Table at 0x0040 [ 0.340000] Amd/Fujitsu Extended Query version 1.1. [ 0.340000] physmap-flash.0: Swapping erase regions for top-boot CFI table. [ 0.350000] number of CFI chips: 1 [ 0.350000] Creating 6 MTD partitions on "physmap-flash.0": [ 0.360000] 0x000000000000-0x000000030000 : "u-boot" [ 0.370000] 0x000000030000-0x000000040000 : "u-boot-env" [ 0.380000] 0x000000040000-0x000000050000 : "factory" [ 0.390000] 0x000000050000-0x000000170000 : "kernel" [ 0.400000] 0x000000170000-0x000000800000 : "rootfs" [ 0.410000] mtd: partition "rootfs" set to be root filesystem [ 0.410000] mtd: partition "rootfs_data" created automatically, ofs=2B0000, len=550000 [ 0.420000] 0x0000002b0000-0x000000800000 : "rootfs_data" [ 0.430000] 0x000000050000-0x000000800000 : "firmware" [ 0.450000] TCP westwood registered [ 0.460000] NET: Registered protocol family 17 [ 0.460000] 8021q: 802.1Q VLAN Support v1.8 [ 0.470000] VFS: Mounted root (squashfs filesystem) readonly on device 31:4. [ 0.480000] Freeing unused kernel memory: 172k freed [ 7.220000] SCSI subsystem initialized [ 7.390000] usbcore: registered new interface driver usbfs [ 7.400000] usbcore: registered new interface driver hub [ 7.410000] usbcore: registered new device driver usb [ 7.470000] ip_tables: (C) 2000-2006 Netfilter Core Team [ 7.670000] nf_conntrack version 0.5.0 (468 buckets, 1872 max) [ 10.990000] device eth0.1 entered promiscuous mode [ 10.990000] device eth0 entered promiscuous mode [ 11.020000] br-lan: port 1(eth0.1) entered forwarding state [ 11.020000] br-lan: port 1(eth0.1) entered forwarding state [ 12.920000] ramips-wdt: timeout value 60 must be 0 < timeout < 40 [ 13.020000] br-lan: port 1(eth0.1) entered forwarding state [ 19.490000] jffs2_scan_eraseblock(): End of filesystem marker found at 0x0 [ 19.510000] jffs2_build_filesystem(): unlocking the mtd device... done. [ 19.510000] jffs2_build_filesystem(): erasing all blocks after the end marker... done. [ 68.360000] JFFS2 notice: (780) jffs2_build_xattr_subsystem: complete building xattr subsystem, 0 of xdatum (0 unchecked, 0 orphan) and 0 of xref (0 dead, 0 orp.

[8devices]

Commit aebe0a6a3101d5d3766faa1014707f9bf4f75f1e fixed "no UART" problem. Created a new carambola/v2.1-rc2 tag.