diff options
| author | Tom Rini <trini@ti.com> | 2014-12-01 15:24:07 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-01 15:24:07 -0500 |
| commit | f4e7e2d12164c3235c3f5e19a68a503623029d35 (patch) | |
| tree | dea8bdf2bf2a50f561c165b5bbd4e1195ab01994 /include/configs | |
| parent | 9e374e7b729dc9f68be89cd3e3b1d4d48c768ecf (diff) | |
| parent | 908ec6e4d1d12f746cb9b7cc73430a268ceb2c92 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/chromebook_link.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h index 8caeca6430..645b31c2e2 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 @@ -40,20 +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 -#undef CONFIG_ICH_SPI -#undef CONFIG_SPI -#undef CONFIG_CMD_SPI -#undef CONFIG_CMD_SF -#undef CONFIG_USB_EHCI -#undef CONFIG_CMD_USB -#undef CONFIG_CMD_SCSI +#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 @@ -67,6 +55,18 @@ #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_BIOSEMU +#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" |