Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / warp7.h

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 9642dd9c4cc03d32bf0a453373a625d87aef3e4a..4528f094ce3447c80619c9971785ead91926f7dd 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -18,11 +18,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (35 * SZ_1M)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
-
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       USDHC3_BASE_ADDR
 #define CONFIG_SUPPORT_EMMC_BOOT
@@ -40,6 +35,7 @@
        "script=boot.scr\0" \
        "image=zImage\0" \
        "console=ttymxc0\0" \
+       "ethact=usb_ether\0" \
        "fdt_high=0xffffffff\0" \
        "initrd_high=0xffffffff\0" \
        "fdt_file=imx7s-warp.dtb\0" \
@@ -147,4 +143,10 @@
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 
+#define CONFIG_USB_ETHER
+#define CONFIG_USB_ETH_CDC
+#define CONFIG_USB_ETH_RNDIS
+#define CONFIG_USBNET_HOST_ADDR                "de:ad:be:af:00:00"
+#define CONFIG_USBNET_DEV_ADDR         "de:ad:be:af:00:01"
+
 #endif