diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-07-05 14:39:13 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-07-05 14:39:13 +0000 |
| commit | f74d16548d4bb98910647c8d6ab2a9198bb32955 (patch) | |
| tree | b8ba53f513ef4959cba78396934e2d4aa5852feb /target/linux/sibyte | |
| parent | 62e10e70175e71ac7c214b3158b9d20b30539b3b (diff) | |
| download | upstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.tar.gz upstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.tar.bz2 upstream-f74d16548d4bb98910647c8d6ab2a9198bb32955.zip | |
update targets to 2.6.30.1, update patches
SVN-Revision: 16697
Diffstat (limited to 'target/linux/sibyte')
| -rw-r--r-- | target/linux/sibyte/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index 018539da3a..934b99e19f 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Broadcom/SiByte SB-1 FEATURES:=fpu CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time -LINUX_VERSION:=2.6.30 +LINUX_VERSION:=2.6.30.1 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch b/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch index e9d63113fd..2c46ccf66d 100644 --- a/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch +++ b/target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch @@ -103,7 +103,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> -lib-$(CONFIG_SIBYTE_CFE_CONSOLE) += console.o --- a/arch/mips/sibyte/cfe/setup.c +++ /dev/null -@@ -1,350 +0,0 @@ +@@ -1,344 +0,0 @@ -/* - * Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation - * @@ -394,13 +394,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> - */ - cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE); - if (cfe_getenv("LINUX_CMDLINE", arcs_cmdline, CL_SIZE) < 0) { -- if (argc < 0) { -- /* -- * It's OK for direct boot to not provide a -- * command line -- */ -- strcpy(arcs_cmdline, "root=/dev/ram0 "); -- } else { +- if (argc >= 0) { - /* The loader should have set the command line */ - /* too early for panic to do any good */ - printk("LINUX_CMDLINE not defined in cfe."); |