aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Hempel <ralph.hempel@lantiq.com>2010-04-24 06:03:31 +0000
committerRalph Hempel <ralph.hempel@lantiq.com>2010-04-24 06:03:31 +0000
commit5f643ca7dc2fe4afcdbcb4bf7b30ce23ec23eff5 (patch)
treed46231902cfff6c8f068c22f7cc583b7446e363f
parentacb329137e21c7dd05e17aadce4d5840ddee55c9 (diff)
downloadupstream-5f643ca7dc2fe4afcdbcb4bf7b30ce23ec23eff5.tar.gz
upstream-5f643ca7dc2fe4afcdbcb4bf7b30ce23ec23eff5.tar.bz2
upstream-5f643ca7dc2fe4afcdbcb4bf7b30ce23ec23eff5.zip
fix command line buffer length, fixes mtdparts
SVN-Revision: 21117
-rw-r--r--package/uboot-lantiq/files/include/configs/ifx-common.h4
-rw-r--r--package/uboot-lantiq/patches/300-httpd.patch2
-rw-r--r--package/uboot-lantiq/patches/310-fix-httpd.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/package/uboot-lantiq/files/include/configs/ifx-common.h b/package/uboot-lantiq/files/include/configs/ifx-common.h
index 88569ada9c..e4e8067d74 100644
--- 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 d244e2d42c..8c4c1ffb6e 100644
--- 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
+
diff --git a/package/uboot-lantiq/patches/310-fix-httpd.patch b/package/uboot-lantiq/patches/310-fix-httpd.patch
index 51a96fc588..b27ed5859a 100644
--- a/package/uboot-lantiq/patches/310-fix-httpd.patch
+++ b/package/uboot-lantiq/patches/310-fix-httpd.patch
@@ -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");