Convert CONFIG_CMD_IDE to Kconfig

[platform/kernel/u-boot.git] / include / configs / qemu-x86.h

diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index b0d2ffe..b751ad5 100644 (file)
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -14,13 +14,10 @@
 #include <configs/x86-common.h>
 
 #define CONFIG_SYS_MONITOR_LEN         (1 << 20)
-#define CONFIG_ARCH_EARLY_INIT_R
-
-#define CONFIG_PCI_PNP
 
 #define CONFIG_STD_DEVICES_SETTINGS    "stdin=serial,i8042-kbd\0" \
-                                       "stdout=serial,vga\0" \
-                                       "stderr=serial,vga\0"
+                                       "stdout=serial,vidconsole\0" \
+                                       "stderr=serial,vidconsole\0"
 
 /*
  * ATA/SATA support for QEMU x86 targets
@@ -30,7 +27,6 @@
  * Default configuraion is to support the QEMU default x86 target
  * Undefine CONFIG_CMD_IDE to support q35 target
  */
-#define CONFIG_CMD_IDE
 #ifdef CONFIG_CMD_IDE
 #define CONFIG_SYS_IDE_MAXBUS          2
 #define CONFIG_SYS_IDE_MAXDEVICE       4
@@ -43,7 +39,7 @@
 #define CONFIG_ATAPI
 
 #undef CONFIG_SCSI_AHCI
-#undef CONFIG_CMD_SCSI
+#undef CONFIG_SCSI
 #else
 #define CONFIG_SCSI_DEV_LIST           \
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI}
@@ -56,4 +52,13 @@
 #undef CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_IS_NOWHERE
 
+#define CONFIG_SPL_FRAMEWORK
+
+#define CONFIG_SPL_TEXT_BASE           0xfffd0000
+
+#define BOOT_DEVICE_SPI                        10
+
+#define CONFIG_SPL_BOARD_LOAD_IMAGE
+#define BOOT_DEVICE_BOARD              11
+
 #endif /* __CONFIG_H */