qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 06:14:37 +02:00
Code

[uboot-lantiq] fix command line buffer length, fixes mtdparts

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21117 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
ralph 2010-04-24 06:03:31 +00:00
parent 8b191d1960
commit 6125e3dc77
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/uboot-lantiq/files/include/configs/ifx-common.h
View File

@ -48,7 +48,7 @@
"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \
":${hostname}:${netdev}:off\0" \ ":${hostname}:${netdev}:off\0" \
"addmisc=setenv bootargs ${bootargs} init=/etc/preinit " \ "addmisc=setenv bootargs ${bootargs} init=/etc/preinit " \
"console=ttyS1,115200 ethaddr=${ethaddr} ${mtdparts}" \ "console=ttyS1,115200 ethaddr=${ethaddr} " \
"${mtdparts}\0" \ "${mtdparts}\0" \
"flash_flash=run flashargs addip addmisc;" \ "flash_flash=run flashargs addip addmisc;" \
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
@ -113,7 +113,7 @@
#ifndef CONFIG_SYS_PROMPT #ifndef CONFIG_SYS_PROMPT
#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */
#endif #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_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */

2
package/uboot-lantiq/patches/300-httpd.patch
View File

@ -12,7 +12,7 @@
+ +
+U_BOOT_CMD( +U_BOOT_CMD(
+ httpd, 1, 1, do_httpd, + httpd, 1, 1, do_httpd,
+ "httpd\t- start webserver\n", "\n" + "httpd\t- start webserver", ""
+); +);
+#endif +#endif
+ +

2
package/uboot-lantiq/patches/310-fix-httpd.patch
View File

@ -35,7 +35,7 @@
# endif # endif
+# ifdef CONFIG_CMD_HTTPD +# ifdef CONFIG_CMD_HTTPD
+ if (ret < 0) { + if (ret != 0) {
+ printf("Failed to execute bootcmd " + printf("Failed to execute bootcmd "
+ "(maybe invalid u-boot environment?), " + "(maybe invalid u-boot environment?), "
+ "starting httpd to update firmware...\n"); + "starting httpd to update firmware...\n");