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

[u-boot] / include / configs / qemu-malta.h

diff --git a/include/configs/qemu-malta.h b/include/configs/qemu-malta.h
index c72c5dd8898c70bb19893a30e73e8f0c940f5f63..4e7ad3323062e8ab57a43f736eb6f46d93e08b90 100644 (file)
--- a/include/configs/qemu-malta.h
+++ b/include/configs/qemu-malta.h
@@ -1,9 +1,7 @@
 /*
  * Copyright (C) 2013 Gabor Juhos <juhosg@openwrt.org>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef _QEMU_MALTA_CONFIG_H
@@ -17,6 +15,11 @@
  */
 #define CONFIG_QEMU_MALTA
 
+#define CONFIG_PCI
+#define CONFIG_PCI_GT64120
+#define CONFIG_PCI_PNP
+#define CONFIG_PCNET
+
 /*
  * CPU Configuration
  */
@@ -34,7 +37,7 @@
  * Memory map
  */
 #define CONFIG_SYS_TEXT_BASE           0xbfc00000 /* Rom version */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
 
 #define CONFIG_SYS_SDRAM_BASE          0x80000000 /* Cached addr */
 #define CONFIG_SYS_MEM_SIZE            (256 * 1024 * 1024)
@@ -86,7 +89,12 @@
 /*
  * Flash configuration
  */
-#define CONFIG_SYS_NO_FLASH
+#define CONFIG_SYS_FLASH_BASE          (KSEG1 | MALTA_FLASH_BASE)
+#define CONFIG_SYS_MAX_FLASH_BANKS     1
+#define CONFIG_SYS_MAX_FLASH_SECT      128
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 /*
  * Commands
@@ -96,9 +104,11 @@
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_LOADB
 #undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NET
 #undef CONFIG_CMD_NFS
 
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+
 #define CONFIG_SYS_LONGHELP            /* verbose help, undef to save memory */
 
 #endif /* _QEMU_MALTA_CONFIG_H */