leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Rename coreboot-serial to x86-serial

Browse Source 
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2014-12-17 15:50:47 +08:00 committed by Simon Glass
parent aada6276c6
commit 41702bac01
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/dts/coreboot.dtsi
View File

@ -6,7 +6,7 @@
};
serial {
compatible = "coreboot-uart";
compatible = "x86-uart";
reg = <0x3f8 0x10>;
reg-shift = <0>;
io-mapped = <1>;

2
drivers/serial/Makefile
View File

@ -43,7 +43,7 @@ obj-$(CONFIG_ARC_SERIAL) += serial_arc.o
obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o
obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o
obj-$(CONFIG_COREBOOT_SERIAL) += serial_coreboot.o
obj-$(CONFIG_X86_SERIAL) += serial_x86.o
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_USB_TTY) += usbtty.o

12
drivers/serial/serial_coreboot.c → drivers/serial/serial_x86.c
View File

@ -9,12 +9,12 @@
#include <ns16550.h>
#include <serial.h>
static const struct udevice_id coreboot_serial_ids[] = {
{ .compatible = "coreboot-uart" },
static const struct udevice_id x86_serial_ids[] = {
{ .compatible = "x86-uart" },
{ }
};
static int coreboot_serial_ofdata_to_platdata(struct udevice *dev)
static int x86_serial_ofdata_to_platdata(struct udevice *dev)
{
struct ns16550_platdata *plat = dev_get_platdata(dev);
int ret;
@ -27,10 +27,10 @@ static int coreboot_serial_ofdata_to_platdata(struct udevice *dev)
return 0;
}
U_BOOT_DRIVER(serial_ns16550) = {
.name = "serial_coreboot",
.name = "serial_x86",
.id = UCLASS_SERIAL,
.of_match = coreboot_serial_ids,
.ofdata_to_platdata = coreboot_serial_ofdata_to_platdata,
.of_match = x86_serial_ids,
.ofdata_to_platdata = x86_serial_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
.priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe,

2
include/configs/chromebook_link.h
View File

@ -28,7 +28,7 @@
#define CONFIG_X86_MRC_ADDR 0xfffa0000
#define CONFIG_CACHE_MRC_SIZE_KB 512
#define CONFIG_COREBOOT_SERIAL
#define CONFIG_X86_SERIAL
#define CONFIG_SCSI_DEV_LIST {PCI_VENDOR_ID_INTEL, \
PCI_DEVICE_ID_INTEL_NM10_AHCI}, \

2
include/configs/coreboot.h
View File

@ -49,7 +49,7 @@
{PCI_VENDOR_ID_INTEL, \
PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
#define CONFIG_COREBOOT_SERIAL
#define CONFIG_X86_SERIAL
#define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
"stdout=vga,serial,cbmem\0" \

2
include/configs/crownbay.h
View File

@ -20,7 +20,7 @@
#define CONFIG_X86_RESET_VECTOR
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_COREBOOT_SERIAL
#define CONFIG_X86_SERIAL
#define CONFIG_SMSC_LPC47M
#define CONFIG_PCI_MEM_BUS 0x40000000