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

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

diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index 17fa4a13d3a67d33933939705a7856033b263eb4..c6637002b510c4489ecb655caf2e2541bb1171a1 100644 (file)
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -28,9 +28,6 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/mx5x_pins.h>
 
-#define CONFIG_SYS_MX5_HCLK            24000000
-#define CONFIG_SYS_MX5_CLK32           32768
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
@@ -64,7 +61,6 @@
 /* Ethernet on FEC */
 #define CONFIG_NET_MULTI
 #define CONFIG_MII
-#define CONFIG_DISCOVER_PHY
 
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE                   FEC_BASE_ADDR
@@ -72,7 +68,7 @@
 #define CONFIG_PHY_ADDR                        CONFIG_FEC_MXC_PHYADDR
 #define CONFIG_RESET_PHY_R
 #define CONFIG_FEC_MXC_NO_ANEG
-#define CONFIG_PRIME   "FEC0"
+#define CONFIG_ETHPRIME                        "FEC0"
 
 /* SPI */
 #define CONFIG_HARD_SPI
@@ -133,9 +129,6 @@
 #define CONFIG_SYS_HZ          1000
 #define CONFIG_CMDLINE_EDITING
 
-/* Stack sizes */
-#define CONFIG_STACKSIZE       (128 * 1024)    /* regular stack */
-
 /* Physical Memory Map */
 #define CONFIG_NR_DRAM_BANKS   1
 #define PHYS_SDRAM_1           CSD0_BASE_ADDR
@@ -184,8 +177,6 @@
  */
 
 #define HOSTNAME ima3-mx53
-#define xstr(s)        str(s)
-#define str(s) #s
 
 #define CONFIG_HOSTNAME ima3-mx53
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
@@ -207,9 +198,9 @@
        "loadaddr=70800000\0"                                           \
        "kernel_addr_r=70800000\0"                                      \
        "ramdisk_addr_r=71000000\0"                                     \
-       "hostname=" xstr(CONFIG_HOSTNAME) "\0"                          \
-       "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0"                   \
-       "ramdisk_file=" xstr(CONFIG_HOSTNAME) "/uRamdisk\0"             \
+       "hostname=" __stringify(CONFIG_HOSTNAME) "\0"                   \
+       "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0"            \
+       "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0"      \
        "mmcargs=setenv bootargs root=${mmcroot} "                      \
                "rootfstype=${mmcrootfstype}\0"                         \
        "mmcroot=/dev/mmcblk0p3 rw\0"                                   \
@@ -238,7 +229,7 @@
                "run satargs addip addtty addmtd addmisc;"              \
                "sata init;ext2load sata 0:1 ${kernel_addr_r} "         \
                "${satafile};bootm\0"                                   \
-       "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.imx\0"                 \
+       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.imx\0"          \
        "uimage=uImage\0"                                               \
        "load=tftp ${loadaddr} ${u-boot}\0"                             \
        "uboot_addr=0xf0001000\0"                                       \