Merge branch 'tx28-update' into tx28-bugfix

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index d7383a62c69072664bc8cde3d01221e44e1ebe53..3b97d91e582c4e8b7285790d2e0486f85ee90363 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -4,7 +4,7 @@
  *
  * Based on Motion-PRO board config file by Robert McCullough, rob@promessinc.com
  *
- * SPDX-License-Identifier:    GPL-2.0+ 
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -15,9 +15,10 @@
  */
 
 /* CPU and board */
-#define CONFIG_MPC5xxx         1       /* This is an MPC5xxx CPU */
-#define CONFIG_MPC5200         1       /* More exactly a MPC5200 */
+#define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_MOTIONPRO       1       /* ... on Promess Motion-PRO board */
+#define CONFIG_SYS_GENERIC_BOARD
+#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
@@ -34,8 +35,6 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_DATE
@@ -49,7 +48,6 @@
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
@@ -74,20 +72,12 @@
  * Autobooting
  */
 #define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds */
-#define CONFIG_AUTOBOOT_KEYED
-#define CONFIG_AUTOBOOT_STOP_STR       "\x1b\x1b"
-#define DEBUG_BOOTKEYS         0
-#undef CONFIG_AUTOBOOT_DELAY_STR
 #undef CONFIG_BOOTARGS
-#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, "           \
-                               "press \"<Esc><Esc>\" to stop\n", bootdelay
 
 #define CONFIG_CMDLINE_EDITING         1       /* add command line history     */
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
 #define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
-#define CONFIG_ETHADDR         00:50:C2:40:10:00
-#define CONFIG_OVERWRITE_ETHADDR_ONCE  1
 #define CONFIG_VERSION_VARIABLE        1       /* include version env variable */
 
 /*
@@ -368,7 +358,6 @@ extern void __led_set(led_id_t id, int state);
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory    */
-#define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt   */
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)     /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS             16              /* max number of command args */
@@ -380,8 +369,6 @@ extern void __led_set(led_id_t id, int state);
 
 #define CONFIG_SYS_LOAD_ADDR           0x200000        /* default kernel load addr */
 
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
-
 /*
  * Various low-level settings
  */