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

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 { serial {
compatible = "coreboot-uart"; compatible = "x86-uart";
reg = <0x3f8 0x10>; reg = <0x3f8 0x10>;
reg-shift = <0>; reg-shift = <0>;
io-mapped = <1>; 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_TEGRA_SERIAL) += serial_tegra.o
obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
obj-$(CONFIG_OMAP_SERIAL) += serial_omap.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 ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_USB_TTY) += usbtty.o 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 <ns16550.h>
#include <serial.h> #include <serial.h>
static const struct udevice_id coreboot_serial_ids[] = { static const struct udevice_id x86_serial_ids[] = {
{ .compatible = "coreboot-uart" }, { .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); struct ns16550_platdata *plat = dev_get_platdata(dev);
int ret; int ret;
@ -27,10 +27,10 @@ static int coreboot_serial_ofdata_to_platdata(struct udevice *dev)
return 0; return 0;
} }
U_BOOT_DRIVER(serial_ns16550) = { U_BOOT_DRIVER(serial_ns16550) = {
.name = "serial_coreboot", .name = "serial_x86",
.id = UCLASS_SERIAL, .id = UCLASS_SERIAL,
.of_match = coreboot_serial_ids, .of_match = x86_serial_ids,
.ofdata_to_platdata = coreboot_serial_ofdata_to_platdata, .ofdata_to_platdata = x86_serial_ofdata_to_platdata,
.platdata_auto_alloc_size = sizeof(struct ns16550_platdata), .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
.priv_auto_alloc_size = sizeof(struct NS16550), .priv_auto_alloc_size = sizeof(struct NS16550),
.probe = ns16550_serial_probe, .probe = ns16550_serial_probe,

2
include/configs/chromebook_link.h
View file

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

2
include/configs/coreboot.h
View file

@ -49,7 +49,7 @@
{PCI_VENDOR_ID_INTEL, \ {PCI_VENDOR_ID_INTEL, \
PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE} 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" \ #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \
"stdout=vga,serial,cbmem\0" \ "stdout=vga,serial,cbmem\0" \

2
include/configs/crownbay.h
View file

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