Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/FADS823.h b/include/configs/FADS823.h
index f810af2ceca6fdb37397a3a83726c678c929e890..6f3e6a75b84653092259906c877b8518ee7c5904 100644 (file)
--- a/include/configs/FADS823.h
+++ b/include/configs/FADS823.h
@@ -93,10 +93,10 @@
 #define CONFIG_LOADS_ECHO      0       /* Dont echoes received characters */
 #define CONFIG_BOOTARGS                ""
 #define CONFIG_BOOTCOMMAND                                                     \
-"bootp ;"                                                                      \
-"setenv bootargs console=tty0 console=ttyS0 "                                  \
-"root=/dev/nfs nfsroot=${serverip}:${rootpath} "                               \
-"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off ;"      \
+"bootp ;"                                                                      \
+"setenv bootargs console=tty0 console=ttyS0 "                                  \
+"root=/dev/nfs nfsroot=${serverip}:${rootpath} "                               \
+"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off ;"      \
 "bootm"
 #else
 #define CONFIG_BOOTDELAY       0       /* autoboot disabled            */
@@ -458,10 +458,6 @@
 */
 #define NR_8259_INTS   0
 
-/* Machine type
-*/
-#define _MACH_8xx (_MACH_fads)
-
 /*
  * MPC8xx CPM Options
  */