From 65990d568074ad878cbc7e4eb1053508e3707cb6 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 18:18:22 -0700 Subject: x86: Remove board_early_init_r() This function is not needed. Remove it to improve the generic init sequence slightly. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- include/configs/chromebook_link.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 8caeca6..cd4a8a0 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -21,7 +21,6 @@ #define CONFIG_DCACHE_RAM_MRC_VAR_SIZE 0x4000 #define CONFIG_SYS_X86_START16 0xfffff800 #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_DISPLAY_CPUINFO #define CONFIG_X86_RESET_VECTOR -- cgit v1.1 From b6b4a0ec5550cf5e45e9b0b3527db63464e4c3d8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 18:18:29 -0700 Subject: x86: config: Enable plug-and-play for link PCI Enable this option so that we can configure the available PCI devices. Also make sure that PCI is available early after relocation as we use it for several other subsystems. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index cd4a8a0..055b3ac 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -66,6 +66,9 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0xefff +#define CONFIG_SYS_EARLY_PCI_INIT +#define CONFIG_PCI_PNP + #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ "stdout=vga,serial\0" \ "stderr=vga,serial\0" -- cgit v1.1 From 4896f4acc8b67155026cd1095b5dcdb22e70445a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 18:18:39 -0700 Subject: x86: dts: Add SATA settings for link Add the requires settings to enable SATA on link. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 055b3ac..e9efd7c 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -52,7 +52,6 @@ #undef CONFIG_CMD_SF #undef CONFIG_USB_EHCI #undef CONFIG_CMD_USB -#undef CONFIG_CMD_SCSI #define CONFIG_PCI_MEM_BUS 0xe0000000 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -- cgit v1.1 From 79b303467a2aede83dd355b46e4dadbd5b40f0ac Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 18:18:41 -0700 Subject: x86: config: Enable USB on link Enable USB support on link - there are two EHCI ports available. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index e9efd7c..86429cf 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -50,8 +50,6 @@ #undef CONFIG_SPI #undef CONFIG_CMD_SPI #undef CONFIG_CMD_SF -#undef CONFIG_USB_EHCI -#undef CONFIG_CMD_USB #define CONFIG_PCI_MEM_BUS 0xe0000000 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -- cgit v1.1 From 1ccd452b07c21072c15366d19343b61996ce9486 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 24 Nov 2014 21:18:19 -0700 Subject: x86: config: Enable SPI for chromebook_link Enable SPI so that the SPI flash can be used. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 86429cf..6b57b28 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -46,10 +46,6 @@ */ #undef CONFIG_VIDEO #undef CONFIG_CFB_CONSOLE -#undef CONFIG_ICH_SPI -#undef CONFIG_SPI -#undef CONFIG_CMD_SPI -#undef CONFIG_CMD_SF #define CONFIG_PCI_MEM_BUS 0xe0000000 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -- cgit v1.1 From 62d0c5e15347f0ab9998d8bac2845be0d441c8b1 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 20:56:38 -0700 Subject: x86: config: Enable video support for chromebook_link Now that we have the required drivers, enable video support with a suitable option ROM. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 6b57b28..c098c6c 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -39,13 +39,9 @@ {PCI_VENDOR_ID_INTEL, \ PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE} -/* - * These common x86 features are not yet supported, but are added in - * follow-on patches in this series. Add undefs here to avoid every patch - * having to put things back into x86-common.h - */ -#undef CONFIG_VIDEO -#undef CONFIG_CFB_CONSOLE +#define CONFIG_X86_OPTION_ROM_FILENAME pci8086,0166.bin +#define CONFIG_X86_OPTION_ROM_ADDR 0xfff90000 +#define CONFIG_VIDEO_X86 #define CONFIG_PCI_MEM_BUS 0xe0000000 #define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS -- cgit v1.1 From a6fa83f0e7ac669d4ecab8b64fe5b9fb051b6e72 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 20:56:44 -0700 Subject: x86: chromebook_link: Enable the x86 emulator Enable this so that it can be used instead of native execution if desired. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index c098c6c..48ae81e 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -58,6 +58,10 @@ #define CONFIG_SYS_EARLY_PCI_INIT #define CONFIG_PCI_PNP +#define CONFIG_BIOSEMU +#define VIDEO_IO_OFFSET 0 +#define CONFIG_X86EMU_RAW_IO + #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ "stdout=vga,serial\0" \ "stderr=vga,serial\0" -- cgit v1.1 From 22e131ca00ed42cd7485aa1821dc3051bd762a3e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 14 Nov 2014 20:56:45 -0700 Subject: x86: chromebook_link: Enable the Chrome OS EC Enable the Chrome OS EC so that it can be used from U-Boot. Signed-off-by: Simon Glass --- include/configs/chromebook_link.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/configs') diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 48ae81e..645b31c 100644 --- a/include/configs/chromebook_link.h +++ b/include/configs/chromebook_link.h @@ -62,6 +62,11 @@ #define VIDEO_IO_OFFSET 0 #define CONFIG_X86EMU_RAW_IO +#define CONFIG_CROS_EC +#define CONFIG_CROS_EC_LPC +#define CONFIG_CMD_CROS_EC +#define CONFIG_ARCH_EARLY_INIT_R + #define CONFIG_STD_DEVICES_SETTINGS "stdin=usbkbd,vga,serial\0" \ "stdout=vga,serial\0" \ "stderr=vga,serial\0" -- cgit v1.1