Merge branch '2020-05-07-more-kconfig-migrations'

[oweals/u-boot.git] / include / configs / usbarmory.h

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index 270f325a55e2e723f7f1c494a9a9ade40c46491f..fcf5c67dc892bae63e205e23d7fa2855ba9b7462 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -15,8 +15,6 @@
 #include <asm/arch/imx-regs.h>
 
 /* U-Boot environment */
-#define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
-#define CONFIG_ENV_SIZE                (8 * 1024)
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* U-Boot general configurations */
@@ -31,7 +29,6 @@
 #define CONFIG_SYS_FSL_ESDHC_NUM       1
 
 /* USB */
-#define CONFIG_USB_EHCI_MX5
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0
@@ -94,9 +91,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#define CONFIG_SYS_MEMTEST_START       0x70000000
-#define CONFIG_SYS_MEMTEST_END         0x90000000
-
 #define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
 
 #endif                         /* __CONFIG_H */