Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

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

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 0293543..cbba726 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -43,7 +43,6 @@
        "stdout=serial,vidconsole\0" \
        "stderr=serial,vidconsole\0" \
        "panel=HDMI\0" \
-       "autoload=no\0" \
        "uImage=uImage-cm-fx6\0" \
        "zImage=zImage-cm-fx6\0" \
        "kernel=uImage-cm-fx6\0" \
@@ -54,8 +53,6 @@
        "video_dvi=mxcfb0:dev=dvi,1280x800M-32@50,if=RGB32\0" \
        "doboot=bootm ${kernel_addr_r}\0" \
        "doloadfdt=false\0" \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "setboottypez=setenv kernel ${zImage};" \
                "setenv doboot bootz ${kernel_addr_r} - ${fdt_addr_r};" \
                "setenv doloadfdt true;\0" \
@@ -141,7 +138,6 @@
 /* USB */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 
 /* Boot */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)