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

[u-boot] / include / configs / idmr.h

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index fc046d60556869960a48d43a5c96f0580cc5e7fc..55ea567bee1b60a55ea3e05e1a8f918a2838bb8c 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -6,23 +6,7 @@
  * (C) Copyright 2006 Lab X Technologies <zachary.landau@labxtechnologies.com>
  * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #ifndef _IDMR_H
@@ -47,16 +31,15 @@
 #define CONFIG_MCFUART
 #define CONFIG_SYS_UART_PORT           (0)
 #define CONFIG_BAUDRATE                19200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600 , 19200 , 38400 , 57600, 115200 }
 #define CONFIG_ETHADDR         00:06:3b:01:41:55
 #define CONFIG_ETHPRIME
 #define CONFIG_IPADDR          192.168.30.1
 #define CONFIG_SERVERIP                192.168.1.1
-#define CONFIG_ROOTPATH
+#define CONFIG_ROOTPATH                ""
 #define CONFIG_GATEWAYIP       192.168.1.1
 #define CONFIG_NETMASK         255.255.0.0
 #define CONFIG_HOSTNAME                idmr
-#define CONFIG_BOOTFILE                /tftpboot/idmr/uImage
+#define CONFIG_BOOTFILE                "/tftpboot/idmr/uImage"
 #define CONFIG_PREBOOT         "echo;echo Type \\\"run flash_nfs\\\" to mount root " \
                                "filesystem over NFS; echo"
 
@@ -155,7 +138,6 @@
  */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY