bootcount: Migrate CONFIG_SYS_BOOTCOUNT_ADDR

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

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index eb89031317112fe79a588e9e30e6cbb9b5d3597f..610d643712b2bcf108647b1d22d0b893b9ba0079 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -14,8 +14,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE           UART4_BASE
 
@@ -125,17 +123,11 @@
 /* Environment organization */
 #define CONFIG_ENV_OFFSET              (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE                        (8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         1
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX6
-#define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_USB_HOST_ETHER
-#define CONFIG_USB_ETHER_ASIX
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1