Merge git://git.denx.de/u-boot-socfpga

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

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index c9584ad71c92f4b2b07ab9c9ce4649b7c6e85920..ef9f330a0946537797184397fa11b0a1c0b4d461 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -120,7 +120,6 @@
 
 
 
-#define CONFIG_DFU_MTD
 #undef COMMON_ENV_DFU_ARGS
 #define COMMON_ENV_DFU_ARGS    "dfu_args=run bootargs_defaults;" \
                                "setenv bootargs ${bootargs};" \
@@ -140,26 +139,6 @@
        "u-boot.env1 mtddev;" \
        "rootfs mtddevubi" \
 
-#undef MTDIDS_NAME_STR
-#define MTDIDS_NAME_STR                "omap2-nand_concat"
-#undef MTDIDS_DEFAULT
-#define MTDIDS_DEFAULT         "nand2=" MTDIDS_NAME_STR
-
-#undef MTDPARTS_DEFAULT_V2
-#define MTDPARTS_DEFAULT_V2     "mtdparts=" MTDIDS_NAME_STR ":" \
-                               "512k(spl)," \
-                               "512k(spl.backup1)," \
-                               "512k(spl.backup2)," \
-                               "512k(spl.backup3)," \
-                               "7680k(u-boot)," \
-                               "2048k(u-boot.env0)," \
-                               "2048k(u-boot.env1)," \
-                               "2048k(mtdoops)," \
-                               "-(rootfs)"
-
-#undef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT       MTDPARTS_DEFAULT_V2
-
 #undef CONFIG_ENV_SETTINGS_NAND_V2
 #define CONFIG_ENV_SETTINGS_NAND_V2 \
        "nand_active_ubi_vol=rootfs_a\0" \