mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-17 20:51:39 +00:00
serial: pxa: Make use of default_serial_console in serial_pxa
Make use of the newly implemented weak default_serial_console in the serial_pxa driver. This removes all reimplementations of this function from board files. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Tom Rini <trini@ti.com>
This commit is contained in:
parent
407e6a2800
commit
ce6971cdd8
17 changed files with 10 additions and 36 deletions
|
@ -53,11 +53,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console(void)
|
|
||||||
{
|
|
||||||
return &serial_stuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
pxa2xx_dram_init();
|
pxa2xx_dram_init();
|
||||||
|
|
|
@ -52,11 +52,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console(void)
|
|
||||||
{
|
|
||||||
return &serial_ffuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
pxa2xx_dram_init();
|
pxa2xx_dram_init();
|
||||||
|
|
|
@ -51,11 +51,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console(void)
|
|
||||||
{
|
|
||||||
return &serial_ffuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
pxa2xx_dram_init();
|
pxa2xx_dram_init();
|
||||||
|
|
|
@ -29,11 +29,6 @@
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
struct serial_device *default_serial_console(void)
|
|
||||||
{
|
|
||||||
return &serial_ffuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int board_init(void)
|
int board_init(void)
|
||||||
{
|
{
|
||||||
/* We have RAM, disable cache */
|
/* We have RAM, disable cache */
|
||||||
|
|
|
@ -135,11 +135,6 @@ int board_late_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console (void)
|
|
||||||
{
|
|
||||||
return &serial_ffuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
pxa2xx_dram_init();
|
pxa2xx_dram_init();
|
||||||
|
|
|
@ -50,11 +50,6 @@ int board_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console(void)
|
|
||||||
{
|
|
||||||
return &serial_ffuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_ONENAND
|
#ifndef CONFIG_ONENAND
|
||||||
|
|
|
@ -62,11 +62,6 @@ int board_init (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct serial_device *default_serial_console (void)
|
|
||||||
{
|
|
||||||
return &serial_stuart_device;
|
|
||||||
}
|
|
||||||
|
|
||||||
int dram_init(void)
|
int dram_init(void)
|
||||||
{
|
{
|
||||||
pxa2xx_dram_init();
|
pxa2xx_dram_init();
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_STUART 1
|
#define CONFIG_STUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 2
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -55,6 +55,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1
|
#define CONFIG_FFUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -64,6 +64,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1 /* we use FFUART on LUBBOCK */
|
#define CONFIG_FFUART 1 /* we use FFUART on LUBBOCK */
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1
|
#define CONFIG_FFUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
#define CONFIG_BAUDRATE 9600
|
#define CONFIG_BAUDRATE 9600
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -58,6 +58,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1
|
#define CONFIG_FFUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -99,6 +99,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1 /* we use FFUART on LUBBOCK */
|
#define CONFIG_FFUART 1 /* we use FFUART on LUBBOCK */
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
|
@ -68,6 +68,7 @@
|
||||||
#define CONFIG_FFUART 1 /* we use FFUART on Conxs */
|
#define CONFIG_FFUART 1 /* we use FFUART on Conxs */
|
||||||
#define CONFIG_BTUART 1 /* we use BTUART on Conxs */
|
#define CONFIG_BTUART 1 /* we use BTUART on Conxs */
|
||||||
#define CONFIG_STUART 1 /* we use STUART on Conxs */
|
#define CONFIG_STUART 1 /* we use STUART on Conxs */
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
|
@ -75,6 +75,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_FFUART 1
|
#define CONFIG_FFUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 3
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_BTUART 1 /* we use BTUART on XAENIAX */
|
#define CONFIG_BTUART 1 /* we use BTUART on XAENIAX */
|
||||||
|
#define CONFIG_CONS_INDEX 4
|
||||||
|
|
||||||
/* allow to overwrite serial and ethaddr */
|
/* allow to overwrite serial and ethaddr */
|
||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
|
|
|
@ -66,6 +66,7 @@
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PXA_SERIAL
|
#define CONFIG_PXA_SERIAL
|
||||||
#define CONFIG_STUART 1
|
#define CONFIG_STUART 1
|
||||||
|
#define CONFIG_CONS_INDEX 2
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Add table
Reference in a new issue