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

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

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index 2d977ceeb6851b5fadf0409b991022c7af15c5dd..1e089a9bf7545530ed43c38ed51e79d4ed090db0 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -24,8 +24,6 @@
  *
  */
 
-#define CONFIG_LEON3                   /* This is an LEON3 CPU */
-#define CONFIG_LEON            1       /* This is an LEON CPU */
 #define CONFIG_GRSIM           0       /* ... not running on GRSIM */
 #define CONFIG_TSIM            1       /* ... running on TSIM */
 
@@ -55,6 +53,7 @@
 #define CONFIG_CMD_DIAG
 #define CONFIG_CMD_ECHO                /* echo arguments               */
 #define CONFIG_CMD_FPGA                /* FPGA configuration Support   */
+#define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_ITEST       /* Integer (and string) test    */
 #define CONFIG_CMD_LOADB       /* loadb                        */