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

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

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index f4d5dbc..ab1d9f1 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -17,7 +17,6 @@
 /* CPU and board */
 #define CONFIG_MPC5200         1       /* This is a MPC5200 CPU */
 #define CONFIG_MOTIONPRO       1       /* ... on Promess Motion-PRO board */
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_HIGH_BATS       1       /* High BATs supported */
 
@@ -34,19 +33,13 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
 /*
@@ -69,14 +62,9 @@
 /*
  * Autobooting
  */
-#define CONFIG_BOOTDELAY       2       /* autoboot after 2 seconds */
 #undef CONFIG_BOOTARGS
 
 #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_VERSION_VARIABLE        1       /* include version env variable */
 
 /*
  * Default environment settings
@@ -269,7 +257,6 @@
 #define CONFIG_SYS_ATA_DATA_OFFSET     0x0060
 #define CONFIG_SYS_ATA_REG_OFFSET      CONFIG_SYS_ATA_DATA_OFFSET
 #define CONFIG_SYS_ATA_STRIDE          4
-#define CONFIG_DOS_PARTITION
 
 /*
  * I2C configuration
@@ -295,24 +282,10 @@
 /*
  * Status LED configuration
  */
-#define CONFIG_STATUS_LED              /* Status LED enabled */
-#define CONFIG_BOARD_SPECIFIC_LED
 
 #define ENABLE_GPIO_OUT                0x00000024
 #define LED_ON                 0x00000010
 
-#ifndef __ASSEMBLY__
-/*
- * In case of Motion-PRO, a LED is identified by its corresponding
- * GPT Enable and Mode Select Register.
- */
-typedef volatile unsigned long * led_id_t;
-
-extern void __led_init(led_id_t id, int state);
-extern void __led_toggle(led_id_t id);
-extern void __led_set(led_id_t id, int state);
-#endif /* __ASSEMBLY__ */
-
 /*
  * Temperature sensor
  */