Use phy_id from slave_data rather than CONFIG_PHY_ADDR to enable use of multiple...

[karo-tx-uboot.git] / include / configs / apx4devkit.h

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index b5ae44ffd59a52a8d85ef7cad80e98d03c591f8a..73c66af06d5b54ecd53c0c0b2a8705a7d5f7819b 100644 (file)
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -22,8 +22,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/arch/regs-base.h>
-
 /* SoC configurations */
 #define CONFIG_MX28                            /* i.MX28 SoC */
 #define CONFIG_MXS_GPIO                                /* GPIO control */
@@ -32,6 +30,8 @@
 #define MACH_TYPE_APX4DEVKIT   3712
 #define CONFIG_MACH_TYPE       MACH_TYPE_APX4DEVKIT
 
+#include <asm/arch/regs-base.h>
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_ARCH_CPU_INIT
@@ -132,7 +132,7 @@
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC_BOUNCE_BUFFER
+#define CONFIG_BOUNCE_BUFFER
 #define CONFIG_MXS_MMC
 #endif
 
@@ -175,7 +175,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define IMX_FEC_BASE                   MXS_ENET0_BASE
 #define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
 #define CONFIG_FEC_XCV_TYPE            RMII
 #endif