From f8a0ff98cec79677c9892d7990602c8f8235802f Mon Sep 17 00:00:00 2001 From: Ralph Hempel Date: Sat, 24 Apr 2010 06:18:01 +0000 Subject: [PATCH] merges r21117 SVN-Revision: 21118 --- package/uboot-lantiq/files/include/configs/ifx-common.h | 4 ++-- package/uboot-lantiq/patches/300-httpd.patch | 2 +- 2 files changed, 3 insertions(+), 3 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 25e84cde3e..bc93ee61d7 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 + -- 2.30.2