1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-28 05:57:32 +02:00
Commit Graph

6274 Commits

Author SHA1 Message Date
Mirko Vogt
4ff7a9bf6a move defines BOOT_WITH_ENABLE_UART and BOOT_FROM_SDCARD to nanonote.h, so they're available for avt2 as well (fixes build of uboot-xburst-avt2) 2010-05-12 23:27:33 +02:00
Mirko Vogt
6f750effc7 remove redefine of CONFIG_BOOTP_MASK 2010-05-12 23:26:26 +02: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
905ec7ee63 [backfire] merge r21422
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21423 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-10 19:34:38 +00:00
nbd
ea97a4e23d [backfire] backport network hotplug change from r21379
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21380 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 15:58:21 +00:00
nico
26fc64b75e [backfire] adjust kmod-crc16 dependencies and dependencies on kmod-crc16 (closes: #7063)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21377 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 12:01:17 +00:00
nico
47f82141ce [backfire] merge r21261 & r21262
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21376 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 11:22:44 +00:00
nico
aa0bcb7212 [backfire] package/grub: disable curses support
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21367 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 02:37:26 +00:00
nico
d142e71778 [backfire] merge r21305 & r21353
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21366 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 02:15:29 +00:00
nbd
5eaa0e5385 [backfire] backport mac80211 and hostapd from trunk
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21354 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-04 15:36:29 +00:00
florian
bf724b01bf backport r21347 to backfire
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21348 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-04 07:34:00 +00:00
nico
d26b6f388c [backfire] merge r21247
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21339 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 10:34:04 +00:00
nico
b0f21b7569 [backfire] merge r21267, r21282, r21291 & r21318
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21331 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 01:15:19 +00:00
nico
948fb87d05 [backfire] remove ps3-utils, backfire has no ps3 target
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21330 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 00:32:39 +00:00
nico
e7839817bc [backfire] remove goldfish-qemu, backfire has no glodfish target
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21329 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 00:30:27 +00:00
nico
76324c4dd1 [backfire] merge r21205
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21328 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 00:27:32 +00:00
nico
f620512153 [backfire] merge r20784 & r20788
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21327 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-03 00:26:25 +00:00
florian
09df0283ca backport r21313 to backfire
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21314 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 19:52:16 +00:00
Lars-Peter Clausen
99c6c73272 reset to backfire. 2010-05-02 15:41:15 +02: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
lars
34dab46c68 uboot-xburst: Fix lcd display init sequence.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21263 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 13:04:54 +02:00
nico
04e95f9225 [backfire] merge r21282 (closes: #6918)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21294 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 04:40:48 +00:00
jow
e49cd53e15 [backfire] merge r21288
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21289 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 00:45:51 +00:00
jow
4b7df982c5 [backfire] merge r21280
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21281 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-01 12:03:53 +00:00
nbd
5970ed4ddb [backfire] merge vsc73x5-ucode download patch from r21274
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21275 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-30 16:54:53 +00:00
jow
a9553d96c4 [backfire] merge r21270
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21272 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-30 15:55:41 +00:00
Xiangfu Liu
b8b3ecec7b [uboot-xburst] fix some compile warning
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
2010-04-30 11:31:53 +08:00
Xiangfu Liu
0f1cbcc699 correct BOOT_FROM_SDCARD check 2010-04-29 17:56:18 +08:00
Xiangfu Liu
a945822cd6 refresh-uboot-patches.patch
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
2010-04-29 16:10:03 +08:00
jow
958f60c8f1 [backfire] merge r21187
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21189 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-27 13:08:30 +00:00
Xiangfu Liu
1bc7014eb2 enable the TP4, TP5 as UART0
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
2010-04-27 13:16:32 +08:00
Xiangfu Liu
7af2afd015 [uboot-xburst] since QI LB60 don't have UART1 pin out. disable UART1 when press KEY_S 2010-04-25 21:54:45 +08:00
ralph
976b66c9e5 [backfire] merge r21153
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21154 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-25 09:43:45 +00:00
jow
29b44efc0d [backfire] merge r21121
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21122 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-24 11:13:14 +00:00
ralph
2634f8c4fb [backfire] merges r21117
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21118 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-24 06:18:01 +00:00
jow
26fa802708 [backfire] merge r20683
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21113 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-23 15:32:22 +00:00
jow
a1ed470f78 [backfire] merge r20679-r20685
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21112 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-23 15:28:27 +00:00
jow
7fe0fb192e [backfire] merge r21109
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21110 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-23 13:43:57 +00:00
jow
5c8d48eb81 [backfire] merge r21104
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21105 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-23 10:56:27 +00:00
nico
75920ff5a6 [backfire] merge [20906:20912], [20914:20922] & [20972]
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21092 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-22 16:13:06 +00:00
nbd
c1d1fca548 [backfire] merge hostapd fix from r21065
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21066 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-20 21:25:59 +00:00
jow
b6ec3b36ee [backfire] merge r20807
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21048 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-20 16:41:42 +00:00
nbd
726a8ee08d [backfire] merge hostapd fix from r21043
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21044 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-20 15:09:24 +00:00
Xiangfu Liu
8ceec5f9a6 * add console=tty0 to kernel command line.
* when press [S], enable the UART0 and UART1, uboot will delay 3 second wait input from serial console.
 * when press [S] + [M] + [POWER], will enalbe uart then boot from sd card.

Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
2010-04-20 16:29:42 +08:00
nbd
971d0fcaee ath9k: backport the config option removal from r20972
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20974 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-18 00:01:55 +00:00
nbd
6e1497e8ef ath9k: backport the rx stuck bugfix change from r20967
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20973 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-18 00:01:53 +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
juhosg
a64c441ae7 backfire: swconfig: Fix switch name. (backport of r20938)
This patch fixes a small typo in swconfig's client side that caused
it to print the interface name instead of the switch's device name
on the help page.

Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20947 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-16 20:30:00 +00:00
juhosg
d1596eb2f7 backfire: package/modules: package isp116x-hcd driver (backport of r20934)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20946 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-16 20:29:55 +00:00
jow
dc493fac54 [backfire] merge r20935
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@20936 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-16 19:09:39 +00:00