[uboot-lantiq] fix command line buffer length, fixes mtdparts
authorRalph Hempel <ralph.hempel@lantiq.com>
Sat, 24 Apr 2010 06:03:31 +0000 (06:03 +0000)
committerRalph Hempel <ralph.hempel@lantiq.com>
Sat, 24 Apr 2010 06:03:31 +0000 (06:03 +0000)
SVN-Revision: 21117

package/uboot-lantiq/files/include/configs/ifx-common.h
package/uboot-lantiq/patches/300-httpd.patch
package/uboot-lantiq/patches/310-fix-httpd.patch

index 88569ad..e4e8067 100644 (file)
@@ -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"                                \
 #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 */
 
index d244e2d..8c4c1ff 100644 (file)
@@ -12,7 +12,7 @@
 +
 +U_BOOT_CMD(
 +      httpd,  1,      1,      do_httpd,
-+      "httpd\t- start webserver\n", "\n"
++      "httpd\t- start webserver", ""
 +);
 +#endif
 +
index 51a96fc..b27ed58 100644 (file)
@@ -35,7 +35,7 @@
  # endif
  
 +# ifdef CONFIG_CMD_HTTPD
-+              if (ret < 0) {
++              if (ret != 0) {
 +                      printf("Failed to execute bootcmd "
 +                                      "(maybe invalid u-boot environment?), "
 +                                      "starting httpd to update firmware...\n");