Conditionally perform common relocation fixups

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

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 6c150aed3995228d0089e9befe372a48af3b8b53..61310089b7b0bf2af2eb4e5117435939f329d7a1 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -60,7 +60,7 @@
  * Hardware drivers
  */
 
-#define CONFIG_MX31_UART       1
+#define CONFIG_MXC_UART        1
 #define CONFIG_SYS_MX31_UART1          1
 
 #define CONFIG_HARD_SPI                1
@@ -104,9 +104,10 @@
        "prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; protect off all; erase 0xa00d0000 0xa01effff; cp.b 0x80000000 0xa00d0000 $(filesize)\0"
 
 
-#define CONFIG_DRIVER_SMC911X          1
-#define CONFIG_DRIVER_SMC911X_BASE     (CS4_BASE + 0x00020000)
-#define CONFIG_DRIVER_SMC911X_32_BIT   1
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X         1
+#define CONFIG_SMC911X_BASE    (CS4_BASE + 0x00020000)
+#define CONFIG_SMC911X_32_BIT  1
 
 /*
  * Miscellaneous configurable options
@@ -170,7 +171,7 @@
 /*
  * JFFS2 partitions
  */
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #define CONFIG_JFFS2_DEV       "nor0"
 
 #endif /* __CONFIG_H */