Merge git://git.denx.de/u-boot-rockchip

[u-boot] / include / configs / x86-chromebook.h

diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index b0aa875f5e1dc1f92fc9a080388c8c6bd2357605..e8ad29d3d093e8d4cd1b3862e643978daba3f2ea 100644 (file)
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (c) 2015 Google, Inc
  *
  * SPDX-License-Identifier:    GPL-2.0+
@@ -10,18 +9,19 @@
 
 #define CONFIG_SYS_MONITOR_LEN                 (1 << 20)
 
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_X86_MRC_ADDR                    0xfffa0000
-#define CONFIG_CACHE_MRC_SIZE_KB               512
+#define CONFIG_X86_REFCODE_ADDR                        0xffea0000
+#define CONFIG_X86_REFCODE_RUN_ADDR            0
 
 #define CONFIG_SCSI_DEV_LIST   \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_NM10_AHCI}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_AHCI_MOBILE}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_COUGARPOINT_AHCI_SERIES6}, \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}, \
-       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_AHCI}
+       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNXPOINT_AHCI}, \
+       {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_WILDCATPOINT_AHCI}
 
 #define CONFIG_PCI_MEM_BUS     0xe0000000
 #define CONFIG_PCI_MEM_PHYS    CONFIG_PCI_MEM_BUS
@@ -35,14 +35,10 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0xefff
 
-#define CONFIG_PCI_PNP
-
 #define CONFIG_BIOSEMU
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
 
-#define CONFIG_ARCH_EARLY_INIT_R
-
 #undef CONFIG_ENV_IS_NOWHERE
 #undef CONFIG_ENV_SIZE
 #define CONFIG_ENV_SIZE                        0x1000
@@ -50,8 +46,10 @@
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_OFFSET              0x003f8000
 
-#define CONFIG_STD_DEVICES_SETTINGS     "stdin=usbkbd,vga,serial\0" \
-                                       "stdout=vga,serial\0" \
-                                       "stderr=vga,serial\0"
+#define CONFIG_SYS_WHITE_ON_BLACK
+
+#define CONFIG_STD_DEVICES_SETTINGS    "stdin=usbkbd,i8042-kbd,serial\0" \
+                                       "stdout=vidconsole,serial\0" \
+                                       "stderr=vidconsole,serial\0"
 
 #endif