X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Ficonnect.h;h=d528d3f0d43752ab892e131a71ebe6be3b281f72;hb=cf2c7784bd73b77f3a4c423d59d38b47fa0504f1;hp=1a5c93d11ba2a481a8c3801697ad325938c90d9e;hpb=808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4;p=u-boot

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index 1a5c93d11b..d528d3f0d4 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -9,13 +9,6 @@
 #ifndef _CONFIG_ICONNECT_H
 #define _CONFIG_ICONNECT_H
 
-#define CONFIG_SYS_GENERIC_BOARD
-
-/*
- * Version number information
- */
-#define CONFIG_IDENT_STRING	" Iomega iConnect"
-
 /*
  * High level configuration options
  */
@@ -32,19 +25,11 @@
  * Compression configuration
  */
 #define CONFIG_BZIP2
-#define CONFIG_LZMA
-#define CONFIG_LZO
 
 /*
  * Commands configuration
  */
-#define CONFIG_SYS_NO_FLASH		/* declare no flash (NOR/SPI) */
 #define CONFIG_SYS_MVFS
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_NAND
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_USB
 
 /*
  * mv-common.h should be defined after CMD configs since it used them
@@ -52,17 +37,11 @@
  */
 #include "mv-common.h"
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT	"iconnect => "
-
 /*
  * Environment variables configuration
  */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_SECT_SIZE	0x20000
-#else
-#define CONFIG_ENV_IS_NOWHERE
 #endif
 #define CONFIG_ENV_SIZE		0x20000
 #define CONFIG_ENV_OFFSET	0x80000
@@ -77,16 +56,10 @@
 	"ubifsload 0x800000 ${kernel}; "				\
 	"bootm 0x800000"
 
-#define CONFIG_MTDPARTS \
-	"mtdparts=orion_nand:"		\
-	"0x80000@0x0(uboot),"		\
-	"0x20000@0x80000(uboot_env),"	\
-	"-@0xa0000(rootfs)\0"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"console=console=ttyS0,115200\0"	\
 	"mtdids=nand0=orion_nand\0"		\
-	"mtdparts="CONFIG_MTDPARTS		\
+	"mtdparts="CONFIG_MTDPARTS_DEFAULT	\
 	"kernel=/boot/uImage\0"			\
 	"bootargs_root=noinitrd ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs\0"
 
@@ -102,14 +75,7 @@
 /*
  * File system
  */
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
 
 #endif /* _CONFIG_ICONNECT_H */