GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

malta: Tidy up UART address selection

Browse source 
The address of the UART differs based upon the system controller because
it's actually within the I/O port region, which is in a different
location for each system controller. Rather than handling this as 2
UARTs with the correct one selected at runtime, use I/O port accessors
for the UART such that access to it gets translated into the I/O port
region automatically.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
This commit is contained in:
Paul Burton 2016-05-17 07:43:27 +01:00 • committed by Daniel Schwierzeck
parent df8ec55d52
commit 2e7eb12e5c
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
board/imgtec/malta/malta.c
View file

@ -12,7 +12,6 @@
#include <pci_gt64120.h> #include <pci_gt64120.h>
#include <pci_msc01.h> #include <pci_msc01.h>
#include <rtc.h> #include <rtc.h>
#include <serial.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/io.h> #include <asm/io.h>
@ -161,18 +160,6 @@ int misc_init_r(void)
return 0; return 0;
} }
struct serial_device *default_serial_console(void)
{
switch (malta_sys_con()) {
case SYSCON_GT64120:
return &eserial1_device;
default:
case SYSCON_MSC01:
return &eserial2_device;
}
}
void pci_init_board(void) void pci_init_board(void)
{ {
pci_dev_t bdf; pci_dev_t bdf;

4
include/configs/malta.h
View file

@ -67,10 +67,10 @@
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_PORT_MAPPED
#define CONFIG_SYS_NS16550_REG_SIZE 1 #define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_CLK (115200 * 16) #define CONFIG_SYS_NS16550_CLK (115200 * 16)
#define CONFIG_SYS_NS16550_COM1 0xb80003f8 #define CONFIG_SYS_NS16550_COM1 0x3f8
#define CONFIG_SYS_NS16550_COM2 0xbb0003f8
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
/* /*