X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfigs%2Fzmx25.h;h=599d5bb42aacc9f3a9b24106b958f27a763c6acc;hb=1441aa6ae8a77ada40407cdfbec783f5559f1646;hp=374c88a0f4d51654537412747ccec1b08bc762ca;hpb=cdf1a2328a76cc57837d9a6e14a4f11f3a58b2e6;p=oweals%2Fu-boot.git

diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index 374c88a0f4..599d5bb42a 100644
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -32,6 +32,7 @@
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_TEXT_BASE		0xA0000000
 
+#define CONFIG_MACH_TYPE	MACH_TYPE_ZMX25
 /*
  * Environment settings
  */
@@ -45,7 +46,7 @@
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs	*/
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define BOARD_LATE_INIT
+#define CONFIG_BOARD_LATE_INIT
 
 /*
  * Compressions
@@ -65,7 +66,7 @@
  * Serial
  */
 #define CONFIG_MXC_UART
-#define CONFIG_SYS_MX25_UART2
+#define CONFIG_MXC_UART_BASE	UART2_BASE
 #define CONFIG_CONS_INDEX	1	/* use UART2 for console */
 #define CONFIG_BAUDRATE		115200	/* Default baud rate */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
@@ -76,7 +77,6 @@
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR		0x00
 #define CONFIG_MII
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options