projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
iconnect.h
diff --git
a/include/configs/iconnect.h
b/include/configs/iconnect.h
index
a58f076
..
f0d4250
100644
(file)
--- a/
include/configs/iconnect.h
+++ b/
include/configs/iconnect.h
@@
-18,7
+18,6
@@
* High level configuration options
*/
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
* High level configuration options
*/
#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */
-#define CONFIG_KIRKWOOD /* SOC Family Name */
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
#define CONFIG_KW88F6281 /* SOC Name */
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
@@
-39,12
+38,8
@@
*/
#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
#define CONFIG_SYS_MVFS
*/
#define CONFIG_SYS_NO_FLASH /* declare no flash (NOR/SPI) */
#define CONFIG_SYS_MVFS
-#include <config_cmd_default.h>
#define CONFIG_CMD_ENV
#define CONFIG_CMD_ENV
-#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
#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
/*
* mv-common.h should be defined after CMD configs since it used them
@@
-52,9
+47,6
@@
*/
#include "mv-common.h"
*/
#include "mv-common.h"
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT "iconnect => "
-
/*
* Environment variables configuration
*/
/*
* Environment variables configuration
*/
@@
-102,8
+94,6
@@
/*
* File system
*/
/*
* File system
*/
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_FAT
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_UBI
#define CONFIG_CMD_UBIFS