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
powerpc: P4080DS: Remove macro CONFIG_P4080DS
[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
..
4783563
100644
(file)
--- a/
include/configs/qemu-x86.h
+++ b/
include/configs/qemu-x86.h
@@
-16,11
+16,9
@@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_ARCH_EARLY_INIT_R
#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" \
#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
@@
-43,7
+41,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}