Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / MVBC_P.h

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 72714688eba0f00c4b3c5175f27238cd4164935a..1ab2b3d51a2caa60bb0e811865b94190c73e0ebf 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -5,23 +5,7 @@
  * (C) Copyright 2004-2008
  * 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
@@ -29,7 +13,6 @@
 
 #include <version.h>
 
-#define CONFIG_MPC5xxx 1
 #define CONFIG_MPC5200         1
 
 #ifndef CONFIG_SYS_TEXT_BASE
@@ -106,6 +89,7 @@
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_FPGA
+#define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_I2C
 
 #undef CONFIG_WATCHDOG
@@ -121,6 +105,7 @@
 #define CONFIG_BOOTP_NTPSERVER
 #define CONFIG_BOOTP_RANDOM_DELAY
 #define CONFIG_BOOTP_SEND_HOSTNAME
+#define CONFIG_LIB_RAND
 
 /*
  * Autoboot
@@ -269,7 +254,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
@@ -282,8 +266,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 */