projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-samsung
[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
4258dcb
..
687befd
100644
(file)
--- a/
include/configs/qemu-x86.h
+++ b/
include/configs/qemu-x86.h
@@
-14,14
+14,10
@@
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#include <configs/x86-common.h>
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
-#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_ARCH_EARLY_INIT_R
-
-#define CONFIG_PCI_PNP
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
- "stdout=serial,v
ga
\0" \
- "stderr=serial,v
ga
\0"
+ "stdout=serial,v
idconsole
\0" \
+ "stderr=serial,v
idconsole
\0"
/*
* ATA/SATA support for QEMU x86 targets
/*
* ATA/SATA support for QEMU x86 targets
@@
-44,7
+40,7
@@
#define CONFIG_ATAPI
#undef CONFIG_SCSI_AHCI
#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}
#else
#define CONFIG_SCSI_DEV_LIST \
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_AHCI}
@@
-57,4
+53,13
@@
#undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE
#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 */
#endif /* __CONFIG_H */