[U-Boot] [PATCH] arm:at91-boards: remove console_init_f where unnecessary

[Bo Shen]

On 8/17/2012 0:01, Andreas Bießmann wrote:
> A lot of at91 boards have the console_init_f in board_init. This is useless
> cause it was called before by generic code in lib/board.c.
>
> Signed-off-by: Andreas Bießmann <andreas.devel at googlemail.com>
> cc: Jens Scharsig <esw at bus-elektronik.de>
> cc: Stelian Pop <stelian at popies.net>
> cc: Sedji Gaouaou<sedji.gaouaou at atmel.com>
> cc: Albin Tonnerre <albin.tonnerre at free-electrons.com>
> cc: Eric Benard <eric at eukrea.com>
> ---
>   board/BuS/eb_cpux9k2/cpux9k2.c                  |    2 --
>   board/BuS/vl_ma2sc/vl_ma2sc.c                   |    3 ---
>   board/atmel/at91sam9261ek/at91sam9261ek.c       |    3 ---
>   board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |    3 ---
>   board/atmel/at91sam9rlek/at91sam9rlek.c         |    3 ---
>   board/calao/sbc35_a9g20/sbc35_a9g20.c           |    3 ---
>   board/calao/tny_a9260/tny_a9260.c               |    3 ---
>   board/eukrea/cpuat91/cpuat91.c                  |    2 --
>   8 files changed, 22 deletions(-)
>
> diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
> index 54f9b64..776226f 100644
> --- a/board/BuS/eb_cpux9k2/cpux9k2.c
> +++ b/board/BuS/eb_cpux9k2/cpux9k2.c
> @@ -59,8 +59,6 @@ DECLARE_GLOBAL_DATA_PTR;
>   int board_init(void)
>   {
>   	at91_pio_t *pio	= (at91_pio_t *) ATMEL_BASE_PIO;
> -	/* Enable Ctrlc */
> -	console_init_f();
>
>   	/* Correct IRDA resistor problem / Set PA23_TXD in Output */
>   	writel(ATMEL_PMX_AA_TXD2, &pio->pioa.oer);
> diff --git a/board/BuS/vl_ma2sc/vl_ma2sc.c b/board/BuS/vl_ma2sc/vl_ma2sc.c
> index 62ed6fb..84b2060 100644
> --- a/board/BuS/vl_ma2sc/vl_ma2sc.c
> +++ b/board/BuS/vl_ma2sc/vl_ma2sc.c
> @@ -244,9 +244,6 @@ int board_init(void)
>   	writel(pin, &pio->piod.odr);
>   	writel(pin, &pio->piod.owdr);
>
> -	/* Enable Ctrlc */
> -	console_init_f();
> -
>   	gd->bd->bi_arch_number = MACH_TYPE_VL_MA2SC;
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
> diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
> index 47ab839..d30a1ee 100644
> --- a/board/atmel/at91sam9261ek/at91sam9261ek.c
> +++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
> @@ -242,9 +242,6 @@ void lcd_show_board_info(void)
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
> -

Tested on at91sam9g10ek board. It works well without this.

>   #ifdef CONFIG_AT91SAM9G10EK
>   	/* arch number of AT91SAM9G10EK-Board */
>   	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G10EK;
> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> index 5a04274..d02312c 100644
> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> @@ -258,9 +258,6 @@ int board_early_init_f(void)
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
> -

Tested on at91sam9m10g45ek board. It works well without this.

>   	/* arch number of AT91SAM9M10G45EK-Board */
>   #ifdef CONFIG_AT91SAM9M10G45EK
>   	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9M10G45EK;
> diff --git a/board/atmel/at91sam9rlek/at91sam9rlek.c b/board/atmel/at91sam9rlek/at91sam9rlek.c
> index ef0ddd7..e92ec6e 100644
> --- a/board/atmel/at91sam9rlek/at91sam9rlek.c
> +++ b/board/atmel/at91sam9rlek/at91sam9rlek.c
> @@ -192,9 +192,6 @@ int board_early_init_f(void)
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
> -
>   	/* arch number of AT91SAM9RLEK-Board */
>   	gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9RLEK;
>   	/* adress of boot parameters */
> diff --git a/board/calao/sbc35_a9g20/sbc35_a9g20.c b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> index b6c8791..d3b3684 100644
> --- a/board/calao/sbc35_a9g20/sbc35_a9g20.c
> +++ b/board/calao/sbc35_a9g20/sbc35_a9g20.c
> @@ -149,9 +149,6 @@ static void sbc35_a9g20_macb_hw_init(void)
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
> -
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/board/calao/tny_a9260/tny_a9260.c b/board/calao/tny_a9260/tny_a9260.c
> index 31074d0..86e7e65 100644
> --- a/board/calao/tny_a9260/tny_a9260.c
> +++ b/board/calao/tny_a9260/tny_a9260.c
> @@ -83,9 +83,6 @@ static void tny_a9260_nand_hw_init(void)
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
> -
>   	/* adress of boot parameters */
>   	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
>
> diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c
> index f654f87..c74c3fc 100644
> --- a/board/eukrea/cpuat91/cpuat91.c
> +++ b/board/eukrea/cpuat91/cpuat91.c
> @@ -43,8 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;
>
>   int board_init(void)
>   {
> -	/* Enable Ctrlc */
> -	console_init_f();
>   	/* arch number of CPUAT91-Board */
>   	gd->bd->bi_arch_number = MACH_TYPE_CPUAT91;
>   	/* adress of boot parameters */
>