[orion]: use CMDLINE_FORCE

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23942 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index 3b1e82e..a340ffc 100644 (file)
--- 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 (file)
index 08a6b1f..0000000
--- 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;
- }
-