Mirko Vogt
4ecc663fa9
Merge branch 'master' of openwrt-backfire into xburst
...
Conflicts:
target/linux/x86/image/Config.in
2010-06-08 11:24:58 +02:00
hauke
ad3ee57c1f
[backfire] backport r21449
...
ssb: activate CONFIG_SSB_BLOCKIO in the kernel and not in compat-wireless.
Before this patch CONFIG_SSB_BLOCKIO was set to y in compat-wireless
but the in kernel ssb system had it set to n, this causes an invalid pointer.
b43 now needs CONFIG_SSB_BLOCKIO=y
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21558 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-23 22:57:36 +00:00
nico
a8609ee7e8
[backfire] merge r21507 - add missing bits for 2.6.30 ssb update
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21554 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-23 21:46:40 +00:00
Mirko Vogt
e65b1bfafb
Merge commit 'openwrt-backfire/master' into xburst
...
Conflicts:
package/mac80211/patches/120-compat_rcu_dereference.patch
package/mac80211/patches/130-tracepoint_include_linux_version_h.patch
target/linux/x86/Makefile
2010-05-12 19:47:13 +02:00
jow
9b4d06c684
[backfire] merge r21344
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21345 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 20:33:23 +00:00
Lars-Peter Clausen
78fcab66df
Merge commit 'backfire/master' into xburst
...
Conflicts:
feeds.conf.default
package/base-files/Makefile
package/block-extroot/Makefile
package/block-mount/Makefile
package/busybox/Makefile
package/busybox/config/util-linux/Config.in
package/dnsmasq/Makefile
package/dnsmasq/files/dnsmasq.init
package/uhttpd/Makefile
target/linux/adm5120/image/Makefile
target/linux/amazon/image/Makefile
target/linux/ar71xx/config-2.6.33
target/linux/ar71xx/config-2.6.34
target/linux/at91/image/Makefile
target/linux/atheros/patches-2.6.33/220-enet_micrel_workaround.patch
target/linux/coldfire/image/Makefile
target/linux/ep93xx/image/Makefile
target/linux/etrax/image/Makefile
target/linux/gemini/image/Makefile
target/linux/generic-2.6/config-2.6.33
target/linux/generic-2.6/config-2.6.34
target/linux/generic-2.6/patches-2.6.33/007-squashfs_make_lzma_available.patch
target/linux/generic-2.6/patches-2.6.33/014-samsung_flash
target/linux/generic-2.6/patches-2.6.33/020-mips_multi_machine_support.patch
target/linux/generic-2.6/patches-2.6.33/030-pci_disable_common_quirks.patch
target/linux/generic-2.6/patches-2.6.33/060-block2mtd_init.patch
target/linux/generic-2.6/patches-2.6.33/100-netfilter_layer7_2.21.patch
target/linux/generic-2.6/patches-2.6.33/110-netfilter_match_speedup.patch
target/linux/generic-2.6/patches-2.6.33/150-netfilter_imq.patch
target/linux/generic-2.6/patches-2.6.33/202-mips_mem_functions_performance.patch
target/linux/generic-2.6/patches-2.6.33/203-slab_maxsize.patch
target/linux/generic-2.6/patches-2.6.33/205-skb_padding.patch
target/linux/generic-2.6/patches-2.6.33/210-mini_fo_2.6.25_fixes.patch
target/linux/generic-2.6/patches-2.6.33/212-mini_fo_2.6.26_fixes.patch
target/linux/generic-2.6/patches-2.6.33/400-ledtrig_morse.patch
target/linux/generic-2.6/patches-2.6.33/402-ledtrig_netdev.patch
target/linux/generic-2.6/patches-2.6.33/511-yaffs-cvs-2009-04-24.patch
target/linux/generic-2.6/patches-2.6.33/903-hostap_txpower.patch
target/linux/generic-2.6/patches-2.6.33/924-cs5535_gpio.patch
target/linux/generic-2.6/patches-2.6.33/940-wireless_mesh_header.patch
target/linux/generic-2.6/patches-2.6.33/971-ocf_20080917.patch
target/linux/generic-2.6/patches-2.6.33/980-vm_exports.patch
target/linux/generic-2.6/patches-2.6.33/998-openwrt_lzma_options.patch
target/linux/goldfish/image/Makefile
target/linux/iop32x/image/Makefile
target/linux/malta/Makefile
target/linux/malta/README
target/linux/malta/image/Makefile
target/linux/mpc52xx/image/Makefile
target/linux/mpc83xx/image/Makefile
target/linux/omap35xx/image/Makefile
target/linux/ppc40x/config-default
target/linux/ppc40x/patches/004-magicbox.patch
target/linux/ppc40x/patches/005-openrb.patch
target/linux/ps3/image/Makefile
target/linux/pxa/image/Makefile
target/linux/pxcab/image/Makefile
target/linux/ramips/image/Makefile
target/linux/ramips/rt288x/config-2.6.32
target/linux/ramips/rt305x/config-2.6.32
target/linux/s3c24xx/image/Makefile
target/linux/sibyte/image/Makefile
target/linux/ubicom32/image/Makefile
target/linux/x86/generic/config-default
2010-05-02 13:23:58 +02:00
nbd
9631bdae21
[backfire] backport ssb updates from r21269, this is required for future mac80211 updates
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21276 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-30 16:54:57 +00:00
nico
23a82f632f
[backfire] merge r20834, r20840, r20854 & r20855
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21208 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-27 19:28:40 +00:00
juhosg
46990e4e4c
backfire: swconfig: Add cpu port index to help output. (backport of 20939)
...
Let swconfig provide the cpu port index in its help page. This is
needed as e.g. Atheros switches have their cpu port at port 0, not
port 5.
This could allow e.g. luci to get a rough overview of the layout of
the switch.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20948 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-16 20:30:06 +00:00
Lars-Peter Clausen
7d183397d9
Merge commit 'nbd/master' into xburst
2010-04-14 16:51:33 +02:00
acoul
fa4b0fde69
add lzma/jffs2 patches for 2.6.34
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20845 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-13 21:45:03 +00:00
acoul
6376010841
don't use lzma/jffs2 on <2.6.33, set lzma/jffs2 as default for >=2.6.33. switch verbose mode on compresor statistics.
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20844 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-13 21:36:58 +00:00
nico
bca3f225e9
define a shared IMG_PREFIX variable used as a basename for image files, it contains board & subtarget infos (if appropriate) allowing subtargets to share the same bin directory without overwriting each other's files
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20834 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-12 23:15:56 +00:00
acoul
7a35563612
add jffs2/lzma support (not activated by default yet)
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20828 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-12 13:14:42 +00:00
lars
08c30bcfff
[kernel] Add missing symbols to 2.6.34 config
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20816 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-11 22:30:27 +00:00
florian
b02fa11a17
[kernel] swconfig: Check vlan/port indexes for validity.
...
Swconfig needs to make sure that requested vlans/ports actually exist,
else it might read or modify memory not belonging to itself.
This patch adds a quick range check in swconfig's kernel part to
prevent accidential or intentional memory modification.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20811 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-11 20:51:37 +00:00
florian
6740bf6a0f
[kernel] refresh 2.6.33 patches for 2.6.33.2
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20803 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-11 18:15:15 +00:00
blogic
656f01b9c9
[ifxmips] adss 2.6.33 kernel patches, not defult yet as linux-atm breaks on 2.6.33
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20789 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-10 20:11:28 +00:00
juhosg
f382721827
backfire: Generic: Clean up output of AR8216 driver. (backport of r20773)
...
This patch is rather a cosmetic patch. It fixes the following issues:
* Demote the unknown device message to debug level to not spam
the log.
* Fix the version print of the unknown device message.
* Output the 'attach' message only when attaching as switch driver,
not when attaching as phy driver.
* Correctly return NET_RX_DROP when dropping packets.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20774 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-10 11:47:33 +00:00
juhosg
3c6e0e0859
Generic: Clean up output of AR8216 driver.
...
This patch is rather a cosmetic patch. It fixes the following issues:
* Demote the unknown device message to debug level to not spam
the log.
* Fix the version print of the unknown device message.
* Output the 'attach' message only when attaching as switch driver,
not when attaching as phy driver.
* Correctly return NET_RX_DROP when dropping packets.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
Cc: bacfire@openwrt.org
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20773 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-10 11:34:11 +00:00
florian
37ed3994c5
[kernel] refresh patches
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20767 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-09 19:26:57 +00:00
juhosg
c2d7208f8a
backfire: generic: make chip detection more reliable in the AR8216 driver (backport of r20753)
...
Fixes broken ethernet on the Planex MZK-W04NU/W300NH boards.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20762 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-09 12:06:17 +00:00
juhosg
9823d2fc7e
generic: make chip detection more reliable in the AR8216 driver
...
Fixes broken ethernet on the Planex MZK-W04NU/W300NH boards.
Cc: bacfire@openwrt.org
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20753 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-09 08:40:12 +00:00
florian
5ba5604222
[kernel] fix kexec for mips, patch from Adrian Byszuk ( #7115 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20745 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-08 07:53:14 +00:00
jow
52e77b9e47
[backfire] merge r20722
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20723 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-05 23:06:36 +00:00
jow
58618dfb3d
[PATCH 1/2] Add support for the ar8316 switch.
...
This patch enhances the ar8216 driver with ar8316 support and fixes some minor
issues with the ar8216 driver itself. It should not break anything, but isn't
tested on ar8216 devices.
[PATCH 2/2] ar71xx: Add the ar8316 driver to rs pro/rb-450g.
Add the ar8216 driver to the ar71xx target, and add network
configurations for the RouterStation Pro and the RouterBoard RB-450G.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20722 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-05 23:03:16 +00:00
nico
cb341b7ccb
[backfire] remove unused kernel config, files & patches in 10.03
...
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20666 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-03 01:57:27 +00:00
Lars-Peter Clausen
e546cfac78
Merge commit 'nbd/master' into xburst
2010-04-02 17:25:08 +02:00
kaloz
23f27ea50b
[x86]: add a subtarget and drivers for the Intel Tolapai SoC
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20648 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-01 12:05:27 +00:00
Lars-Peter Clausen
2b22c4023e
Merge commit 'nbd/master' into xburst
2010-03-29 14:59:30 +02:00
nbd
244c45bd27
netfilter: fix ABI breakage caused by the netfilter match optimization ( fixes #5628 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20552 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-28 19:05:59 +00:00
nbd
bc3d4f5dfd
enable IP175A support in the IP175C PHY driver (based on patch from jh in #6733 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20551 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-28 18:57:42 +00:00
juhosg
b4fcbf1114
kernel: update to 2.6.32.10
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-26 10:45:25 +00:00
florian
b759850150
[kernel] add missing CONFIG_CB1400_CORE symbol, spotted by buildbot
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20426 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-25 15:27:08 +00:00
acoul
bc06f31e4a
generic-2.6: fix r20386 (thanks nico), update missing symbols on config-2.6.32 too
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20388 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-23 15:02:29 +00:00
acoul
86e3738d75
generic-2.6: config-2.6.33 add missing symbols, closes #6913 (thanks maddes)
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20386 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-23 12:42:17 +00:00
Lars-Peter Clausen
37e44c0bce
Merge commit 'nbd/master' into xburst
2010-03-21 16:56:08 +01:00
hauke
c863d2afc3
kernel: Add some missing config symbols
...
This adds some missing config symbols and opens the menu
behind CONFIG_SND_PCI and CONFIG_ISDN.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20339 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-21 13:57:07 +00:00
acoul
a1ce9f6f9b
generic-2.6: sync patches to 2.6.34-rc2
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20329 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-21 06:53:08 +00:00
juhosg
56f1be7e5c
base-files: show boot state on intramfs images
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20289 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-18 19:19:21 +00:00
florian
d8be9cda89
[kernel] add missing configuration symbols
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20255 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-17 20:21:49 +00:00
Lars-Peter Clausen
277ecd06ee
Merge commit 'nbd/master' into xburst
...
Conflicts:
target/linux/xburst/qi_lb60/config-2.6.32
2010-03-17 16:10:43 +01:00
acoul
27b61d4598
generic-2.6: sync patches to 2.6.33.1
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20236 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-16 08:15:47 +00:00
florian
e8f6f13bcf
[kernel] also fix invalid hunks in 2.6.33 patch
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20209 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 17:21:47 +00:00
florian
30932c53d3
[uml] add 2.6.34 support
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20208 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 17:20:45 +00:00
florian
6b4ad6d718
[kernel] fix invalid hunks in 060-block2mtd_init.patch file
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20207 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 17:20:40 +00:00
florian
cbc1514dc5
[kernel] export rescan_partitions to prevent linking failures in block2mtd ( #6741 )
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20205 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 16:21:33 +00:00
juhosg
55e65f5a88
kernel: refresh lzo patch for 2.6.33
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20199 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-14 13:22:46 +00:00
florian
cc7e88fe96
[kernel] fix the building of the lzo decompressor on some architectures
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20157 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-12 14:24:12 +00:00
nico
edf26e5c98
remove CONFIG_PCI=y missed from [20136] in generic 2.6.30 config
...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20156 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-03-12 11:50:45 +00:00