Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / include / configs / MVSMR.h

diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index bf2f44e..f69b9a8 100644 (file)
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -5,23 +5,7 @@
  * (C) Copyright 2004-2010
  * Matrix-Vision GmbH, andre.schwarz@matrix-vision.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 __CONFIG_H
@@ -239,7 +223,6 @@
 #define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_CMDLINE_EDITING
 #undef         CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "=> "
 #ifdef CONFIG_CMD_KGDB
 #define CONFIG_SYS_CBSIZE              1024
 #else
@@ -252,8 +235,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x00800000
 #define CONFIG_SYS_MEMTEST_END         0x02f00000
 
-#define CONFIG_SYS_HZ                  1000
-
 /* default load address */
 #define CONFIG_SYS_LOAD_ADDR           0x02000000
 /* default location for tftp and bootm */
@@ -280,7 +261,7 @@
 
 #undef FPGA_DEBUG
 #undef CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_FPGA            CONFIG_SYS_XILINX_SPARTAN2
+#define CONFIG_FPGA
 #define CONFIG_FPGA_XILINX     1
 #define CONFIG_FPGA_SPARTAN2   1
 #define CONFIG_FPGA_COUNT      1