GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc4xx: Remove now unused CONFIG_UART1_CONSOLE

Browse source 
CONFIG_UART1_CONSOLE was a PPC4xx specific implementation and is now
removed since the move from the 4xx UART driver to the common NS16550
UART driver. Let's remove all references to this define now.

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2010-09-21 10:24:36 +02:00
parent 550650ddd0
commit e3c78c9b3c
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README
View file

@ -544,13 +544,6 @@ The following options need to be configured:
Leave undefined to disable this feature, including Leave undefined to disable this feature, including
disable the buffer and hardware handshake. disable the buffer and hardware handshake.
- Console UART Number:
CONFIG_UART1_CONSOLE
AMCC PPC4xx only.
If defined internal UART1 (and not UART0) is used
as default U-Boot console.
- Boot Delay: CONFIG_BOOTDELAY - in seconds - Boot Delay: CONFIG_BOOTDELAY - in seconds
Delay before automatically booting the default image; Delay before automatically booting the default image;
set to -1 to disable autoboot. set to -1 to disable autoboot.

5
common/serial.c
View file

@ -54,10 +54,7 @@ struct serial_device *__default_serial_console (void)
#else #else
#error "Bad CONFIG_CONS_INDEX." #error "Bad CONFIG_CONS_INDEX."
#endif #endif
#elif defined(CONFIG_UART1_CONSOLE) return &serial0_device;
return &serial1_device;
#else
return &serial0_device;
#endif #endif
#elif defined(CONFIG_MPC512X) #elif defined(CONFIG_MPC512X)
#if (CONFIG_PSC_CONSOLE == 3) #if (CONFIG_PSC_CONSOLE == 3)

5
drivers/serial/serial_netarm.c
View file

@ -51,13 +51,8 @@ DECLARE_GLOBAL_DATA_PTR;
} }
#ifndef CONFIG_UART1_CONSOLE
volatile netarm_serial_channel_t *serial_reg_ch1 = get_serial_channel(0); volatile netarm_serial_channel_t *serial_reg_ch1 = get_serial_channel(0);
volatile netarm_serial_channel_t *serial_reg_ch2 = get_serial_channel(1); volatile netarm_serial_channel_t *serial_reg_ch2 = get_serial_channel(1);
#else
volatile netarm_serial_channel_t *serial_reg_ch1 = get_serial_channel(1);
volatile netarm_serial_channel_t *serial_reg_ch2 = get_serial_channel(0);
#endif
extern void _netarm_led_FAIL1(void); extern void _netarm_led_FAIL1(void);