[U-Boot] [PATCH] Fix console_buffer size conflict error.

Remy Bohmer linux at bohmer.net
Fri Jun 25 21:39:36 CEST 2010


Wolfgang,

Please look at this one for the 2010.06 release.

Kind regards,

Remy

2010/6/17 Remy Bohmer <linux at bohmer.net>:
> The console_buffer size is declared in common/main.c as
>   -- char console_buffer[CONFIG_SYS_CBSIZE + 1];
> so this extern definition is wrong.
>
> Signed-off-by: Remy Bohmer <linux at bohmer.net>
> ---
>  common/hush.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/common/hush.c b/common/hush.c
> index 06c5ff8..9eea90f 100644
> --- a/common/hush.c
> +++ b/common/hush.c
> @@ -1018,7 +1018,7 @@ static void get_user_input(struct in_str *i)
>        fflush(stdout);
>        i->p = the_command;
>  #else
> -       extern char console_buffer[CONFIG_SYS_CBSIZE];
> +       extern char console_buffer[];
>        int n;
>        static char the_command[CONFIG_SYS_CBSIZE];
>
> --
> 1.7.0.4
>
>


More information about the U-Boot mailing list