configs: Re-sync HUSH options

[people/ms/u-boot.git] / include / configs / grsim_leon2.h

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 2226f5bbb81c112acf860eed1d5df5e018e79110..e06e2611d111df67041f1c642f504adf23050fe9 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -3,15 +3,18 @@
  * (C) Copyright 2003-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * (C) Copyright 2007
- * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com.
+ * (C) Copyright 2007, 2015
+ * Daniel Hellstrom, Cobham Gaisler, daniel@gaisler.com.
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
+
 /*
  * High Level Configuration Options
  * (easy to change)
@@ -23,17 +26,12 @@
  *
  */
 
-#define CONFIG_LEON2           /* This is an LEON2 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 */
 
 /* CPU / AMBA BUS configuration */
 #define CONFIG_SYS_CLK_FREQ    40000000        /* 40MHz */
 
-/* Number of SPARC register windows */
-#define CONFIG_SYS_SPARC_NWINDOWS 8
-
 /*
  * Serial console configuration
  */
@@ -48,21 +46,10 @@
 /*
  * Supported commands
  */
-#define CONFIG_CMD_BDI         /* bdinfo                       */
-#define CONFIG_CMD_CONSOLE     /* coninfo                      */
 #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                        */
-#define CONFIG_CMD_LOADS       /* loads                        */
-#define CONFIG_CMD_MISC                /* Misc functions like sleep etc */
 #define CONFIG_CMD_REGINFO
-#define CONFIG_CMD_RUN         /* run command in env variable  */
-#define CONFIG_CMD_SETGETDCR   /* DCR support on 4xx           */
-#define CONFIG_CMD_SOURCE      /* "source" command support     */
-#define CONFIG_CMD_XIMG                /* Load part of Multi Image     */
 
 /*
  * Autobooting
@@ -74,7 +61,6 @@
        "echo"
 
 #undef CONFIG_BOOTARGS
-/*#define CONFIG_SYS_HUSH_PARSER 0*/
 
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
@@ -92,7 +78,6 @@
        "rootpath=/export/roofs\0"                                      \
        "scratch=40000000\0"                                    \
        "getkernel=tftpboot $(scratch) $(bootfile)\0" \
-       "ethaddr=00:00:7A:CC:00:12\0" \
        "bootargs=console=ttyS0,38400" \
        ""
 #define CONFIG_NETMASK 255.255.255.0
@@ -242,16 +227,6 @@
  */
 /*#define CONFIG_GRETH 1*/
 
-/* Default HARDWARE address */
-#define GRETH_HWADDR_0 0x00
-#define GRETH_HWADDR_1 0x00
-#define GRETH_HWADDR_2 0x7A
-#define GRETH_HWADDR_3 0xcc
-#define GRETH_HWADDR_4 0x00
-#define GRETH_HWADDR_5 0x12
-
-#define CONFIG_ETHADDR   00:00:7a:cc:00:12
-
 /*
  * Define CONFIG_GRETH_10MBIT to force GRETH at 10Mb/s
  */
@@ -262,7 +237,6 @@
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory     */
-#define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt   */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size  */
 #else
@@ -277,8 +251,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x100000        /* default load address */
 
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
-
 /***** Gaisler GRLIB IP-Cores Config ********/
 
 #define CONFIG_SYS_GRLIB_SDRAM    0
@@ -291,8 +263,6 @@
 #define CONFIG_SYS_GRLIB_MEMCFG3  0x00136000
 
 /*** LEON2 UART 1 ***/
-#define CONFIG_SYS_LEON2_UART1_SCALER \
-       ((((CONFIG_SYS_CLK_FREQ*10)/(CONFIG_BAUDRATE*8))-5)/10)
 
 /* UART1 Define to 1 or 0 */
 #define LEON2_UART1_LOOPBACK_ENABLE 0
@@ -302,9 +272,6 @@
 
 /*** LEON2 UART 2 ***/
 
-#define CONFIG_SYS_LEON2_UART2_SCALER \
-       ((((CONFIG_SYS_CLK_FREQ*10)/(CONFIG_BAUDRATE*8))-5)/10)
-
 /* UART2 Define to 1 or 0 */
 #define LEON2_UART2_LOOPBACK_ENABLE 0
 #define LEON2_UART2_FLOWCTRL_ENABLE 0
@@ -323,6 +290,6 @@
 /* default kernel command line */
 #define CONFIG_DEFAULT_KERNEL_COMMAND_LINE "console=ttyS0,38400\0\0"
 
-#define CONFIG_IDENT_STRING "Gaisler GRSIM LEON2"
+#define CONFIG_IDENT_STRING " Gaisler GRSIM LEON2"
 
 #endif                         /* __CONFIG_H */