summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-10 13:13:03 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-10 13:13:03 +0000
commit6d04b3f7665afd6c5805e8dbada852843f65d440 (patch)
tree826f1b58fc689ed533fbfaaf9c9b913cf2e7fd8b /target/linux
parent01ec6e9b96c2f8c3bee4d0812313349988e33eb4 (diff)
[orion]: use CMDLINE_FORCE
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23942 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/orion/config-default1
-rw-r--r--target/linux/orion/patches/010-ignore_atag_cmdline.patch11
2 files changed, 1 insertions, 11 deletions
diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 3b1e82e4b..a340ffcc0 100644
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -33,6 +33,7 @@ CONFIG_BOUNCE=y
# CONFIG_CIFS_STATS is not set
CONFIG_CLASSIC_RCU=y
CONFIG_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
+CONFIG_CMDLINE_FORCE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_32=y
CONFIG_CPU_ABRT_EV5T=y
diff --git a/target/linux/orion/patches/010-ignore_atag_cmdline.patch b/target/linux/orion/patches/010-ignore_atag_cmdline.patch
deleted file mode 100644
index 08a6b1fda..000000000
--- a/target/linux/orion/patches/010-ignore_atag_cmdline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -595,7 +595,7 @@ __tagtable(ATAG_REVISION, parse_tag_revi
-
- static int __init parse_tag_cmdline(const struct tag *tag)
- {
-- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
-+// strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
- return 0;
- }
-