Merge branch 'master' of git://git.denx.de/u-boot-net

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

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index 913ff4f..fedc466 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -20,17 +20,12 @@
 /* For timer, QEMU emulates an ARMv7/ARMv8 architected timer */
 #define CONFIG_SYS_HZ                       1000
 
-/* For block devices, QEMU emulates an ICH9 AHCI controller over PCI */
-#define CONFIG_SYS_SCSI_MAX_SCSI_ID 6
-
-/* QEMU emulates the ARM AMBA PL031 RTC */
-#define CONFIG_SYS_RTC_PL031_BASE      0x09010000
-
 /* Environment options */
 #define CONFIG_ENV_SIZE                                SZ_64K
 
 #define BOOT_TARGET_DEVICES(func) \
-       func(SCSI, scsi, 0)
+       func(SCSI, scsi, 0) \
+       func(DHCP, dhcp, na)
 
 #include <config_distro_bootcmd.h>