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

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

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index d051eec..f260a64 100644 (file)
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -45,18 +45,8 @@
 /* Environment is in MMC */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV         0       /* device 0 */
-#define CONFIG_ENV_OFFSET              512     /* just after the MBR */
-
-/* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_DWC2_REG_ADDR       SOCFPGA_USB1_ADDRESS
-#endif
-#define CONFIG_G_DNL_MANUFACTURER      "DENX"
 
 /* Extra Environment */
-#define CONFIG_HOSTNAME                        mcvevk
-
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "consdev=ttyS0\0"                                               \
        "baudrate=115200\0"                                             \
@@ -66,7 +56,7 @@
        "netdev=eth0\0"                                                 \
        "hostname=mcvevk\0"                                             \
        "kernel_addr_r=0x10000000\0"                                    \
-       "update_filename=u-boot-with-spl-dtb.sfp\0"                     \
+       "update_filename=u-boot-with-spl.sfp\0"                         \
        "update_sd_offset=0x800\0"                                      \
        "update_sd="            /* Update the SD firmware partition */  \
                "if mmc rescan ; then "                                 \