summaryrefslogtreecommitdiffstats
path: root/target/linux/sibyte
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-05 14:39:13 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-07-05 14:39:13 +0000
commitf1d5ca45b61ea84f3f057393fe7d7162b2aa4853 (patch)
treea50abe383d320a28a34e3d5def552f0d423bc638 /target/linux/sibyte
parent74cd05d02c09a9523c5f04979fcf6d8241174b18 (diff)
[kernel] update targets to 2.6.30.1, update patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16697 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sibyte')
-rw-r--r--target/linux/sibyte/Makefile2
-rw-r--r--target/linux/sibyte/patches/002-sibyte_remove_standalone_support.patch10
2 files changed, 3 insertions, 9 deletions
diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile
index 018539da3..934b99e19 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 e9d63113f..2c46ccf66 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.");