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

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

diff --git a/include/configs/munices.h b/include/configs/munices.h
index 3bda8eb..5a6d004 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -11,8 +11,7 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
+#define CONFIG_MPC5200         1       /* This is an MPC5200 CPU */
 #define CONFIG_MPC5200_DDR     1       /* (with DDR-SDRAM) */
 #define CONFIG_MUNICES         1       /* ... on MUNICes board */
 
@@ -27,13 +26,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_ELF
 #define CONFIG_CMD_IMMAP
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_CMD_KGDB)
@@ -48,7 +41,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200, 230400 }
 
 #define        CONFIG_TIMESTAMP        1       /* Print image info with timestamp */
-#define CONFIG_BOOTDELAY       5   /* autoboot after 5 seconds */
 #undef CONFIG_BOOTARGS
 
 #define CONFIG_PREBOOT "echo;" \
@@ -176,7 +168,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x200000        /* default load address */
 
-#define CONFIG_DISPLAY_BOARDINFO 1
 #define CONFIG_CMDLINE_EDITING  1
 
 /*
@@ -189,10 +180,6 @@
 #define CONFIG_SYS_CS_DEADCYCLE        0x33333333
 #define CONFIG_SYS_RESET_ADDRESS       0xff000000
 
-/* pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT       1
-#define CONFIG_OF_BOARD_SETUP  1
-
 #define OF_CPU                 "PowerPC,5200@0"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
 #define OF_SOC                  "soc5200@f0000000"