Move PHY_MICREL and PHY_MICREL_KSZ90X1 to Kconfig

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

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 2c40decf499b9dea9dd800aa3b099f82ebac8106..47379ca1885592a08f5cf53b082a7399ffe77711 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -11,7 +11,7 @@
 #include <asm/arch/imx-regs.h>
 #include <linux/sizes.h>
 #include "mx6_common.h"
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #define is_mx6ul_9x9_evk()     CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
 
@@ -166,7 +166,6 @@
 
 /* environment organization */
 #define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_ENV_OFFSET              (8 * SZ_64K)
 #define CONFIG_SYS_MMC_ENV_DEV         1   /* USDHC2 */
 #define CONFIG_SYS_MMC_ENV_PART                0       /* user area */
@@ -207,9 +206,6 @@
 #define CONFIG_FEC_XCV_TYPE            RMII
 #endif
 #define CONFIG_ETHPRIME                        "FEC"
-
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MICREL
 #endif
 
 #define CONFIG_IMX_THERMAL