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

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

diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h
index ad3775e..9decae7 100644 (file)
--- a/include/configs/openrisc-generic.h
+++ b/include/configs/openrisc-generic.h
@@ -10,7 +10,6 @@
 /*
  * BOARD/CPU
  */
-
 #define CONFIG_SYS_CLK_FREQ            50000000
 #define CONFIG_SYS_RESET_ADDR          0x00000100
 
@@ -31,7 +30,6 @@
 /*
  * SERIAL
  */
-# define CONFIG_SYS_NS16550
 # define CONFIG_SYS_NS16550_SERIAL
 # define CONFIG_SYS_NS16550_REG_SIZE   1
 # define CONFIG_CONS_INDEX             1
@@ -40,13 +38,11 @@
 
 #define CONFIG_BAUDRATE                        CONFIG_SYS_UART_BAUD
 #define CONFIG_SYS_BAUDRATE_TABLE      {CONFIG_BAUDRATE}
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  /* Suppress console info */
 #define CONSOLE_ARG                    "console=console=ttyS0,115200\0"
 
 /*
  * Ethernet
  */
-#define CONFIG_ETHOC
 #define CONFIG_SYS_ETHOC_BASE          0x92000000
 
 #define CONFIG_BOOTFILE                        "boot.img"
@@ -55,7 +51,6 @@
 /*
  * TIMER
  */
-#define CONFIG_SYS_HZ                  1000
 #define CONFIG_SYS_OPENRISC_TMR_HZ     100
 
 /*
@@ -101,7 +96,6 @@
  * MISC
  */
 #define CONFIG_SYS_LONGHELP            /* Provide extended help */
-#define CONFIG_SYS_PROMPT              "==> "  /* Command prompt       */
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O buf size */
 #define CONFIG_SYS_MAXARGS             16      /* Max command args     */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE /* Bootarg buf size */
@@ -116,18 +110,9 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-
 #define CONFIG_CMD_IRQ
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_BSP
 
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_PING
-
-#define CONFIG_OF_LIBFDT
 #define CONFIG_LMB
 
 /*
@@ -138,5 +123,4 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-
 #endif /* __CONFIG_H */