[backfire] merges r21117

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21118 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/uboot-lantiq/files/include/configs/ifx-common.h b/package/uboot-lantiq/files/include/configs/ifx-common.h
index 88569ad..e4e8067 100644 (file)
--- a/package/uboot-lantiq/files/include/configs/ifx-common.h
+++ b/package/uboot-lantiq/files/include/configs/ifx-common.h
@@ -48,7 +48,7 @@
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off\0"                          \
        "addmisc=setenv bootargs ${bootargs} init=/etc/preinit "        \
-               "console=ttyS1,115200 ethaddr=${ethaddr} ${mtdparts}"           \
+               "console=ttyS1,115200 ethaddr=${ethaddr} "              \
                "${mtdparts}\0"                                         \
        "flash_flash=run flashargs addip addmisc;"                      \
                "bootm ${kernel_addr}\0"                                \
@@ -113,7 +113,7 @@
 #ifndef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT              "=> "           /* Monitor Command Prompt */
 #endif
-#define CONFIG_SYS_CBSIZE              256             /* Console I/O Buffer Size */
+#define CONFIG_SYS_CBSIZE              512             /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)  /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS             16              /* max number of command args */
 

diff --git a/package/uboot-lantiq/patches/300-httpd.patch b/package/uboot-lantiq/patches/300-httpd.patch
index 25e84cd..bc93ee6 100644 (file)
--- a/package/uboot-lantiq/patches/300-httpd.patch
+++ b/package/uboot-lantiq/patches/300-httpd.patch
@@ -12,7 +12,7 @@
 +
 +U_BOOT_CMD(
 +      httpd,  1,      1,      do_httpd,
-+      "httpd\t- start webserver\n", "\n"
++      "httpd\t- start webserver", ""
 +);
 +#endif
 +