Merge git://git.denx.de/u-boot-mpc85xx

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

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index ff93c7d..112e885 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -19,14 +19,12 @@
 #define CONFIG_MPC8313
 #define CONFIG_IDS8313
 
-
 #define CONFIG_FSL_ELBC
 
 #define CONFIG_MISC_INIT_R
 
 #define CONFIG_BOOT_RETRY_TIME         900
 #define CONFIG_BOOT_RETRY_MIN          30
-#define CONFIG_BOOTDELAY               1
 #define CONFIG_RESET_TO_RETRY
 
 #define CONFIG_83XX_CLKIN              66000000        /* in Hz */
@@ -415,7 +413,6 @@
  * U-Boot environment setup
  */
 #define CONFIG_CMD_NAND
-#define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_CMD_JFFS2
@@ -442,7 +439,6 @@
 #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
-
 #define CONFIG_NETDEV                  eth1
 #define CONFIG_HOSTNAME                ids8313
 #define CONFIG_ROOTPATH                "/opt/eldk-4.2/ppc_6xx"
@@ -537,7 +533,6 @@
 
 /* UBI Support */
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 #define CONFIG_RBTREE
 #define CONFIG_LZO
@@ -549,8 +544,6 @@
 #define CONFIG_BOOTCOUNT_ALEN  1
 #define CONFIG_SYS_BOOTCOUNT_ADDR      0x9
 
-#define CONFIG_VERSION_VARIABLE
-
 #define CONFIG_IMAGE_FORMAT_LEGACY
 #define CONFIG_CMD_HASH
 #define CONFIG_SHA1