From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 10 Nov 2010 13:13:03 +0000 (+0000)
Subject: use CMDLINE_FORCE
X-Git-Tag: reboot~18421
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cec876fe24ae1883cf11d8a014238a95a618a2b6;p=openwrt%2Fstaging%2Flynxis.git

use CMDLINE_FORCE

SVN-Revision: 23942
---

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 3b1e82e4be..a340ffcc04 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 08a6b1fdac..0000000000
--- 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;
- }
-