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
/
meesc.h
diff --git
a/include/configs/meesc.h
b/include/configs/meesc.h
index
10a6ce9
..
df76a20
100644
(file)
--- a/
include/configs/meesc.h
+++ b/
include/configs/meesc.h
@@
-56,9
+56,6
@@
#define CONFIG_DISPLAY_CPUINFO /* display cpu info and speed */
#define CONFIG_PREBOOT /* enable preboot variable */
#define CONFIG_DISPLAY_CPUINFO /* display cpu info and speed */
#define CONFIG_PREBOOT /* enable preboot variable */
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_OF_LIBFDT
-
/*
* Hardware drivers
*/
/*
* Hardware drivers
*/
@@
-72,9
+69,6
@@
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_BAUDRATE 115200
#define CONFIG_USART_ID ATMEL_ID_SYS
#define CONFIG_BAUDRATE 115200
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
/*
* BOOTP options
*/
/*
* BOOTP options
*/
@@
-86,13
+80,6
@@
/*
* Command line configuration.
*/
/*
* Command line configuration.
*/
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
#ifdef CONFIG_SYS_USE_NANDFLASH
#define CONFIG_CMD_NAND
#ifdef CONFIG_SYS_USE_NANDFLASH
#define CONFIG_CMD_NAND
@@
-153,7
+140,6
@@
/* Ethernet */
#define CONFIG_MACB
#define CONFIG_RMII
/* Ethernet */
#define CONFIG_MACB
#define CONFIG_RMII
-#define CONFIG_FIT
#define CONFIG_NET_RETRY_COUNT 20
#undef CONFIG_RESET_PHY_R
#define CONFIG_NET_RETRY_COUNT 20
#undef CONFIG_RESET_PHY_R
@@
-187,7
+173,6
@@
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
#define CONFIG_SYS_LONGHELP
#define CONFIG_CMDLINE_EDITING
#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
/*
* Size of malloc() pool
/*
* Size of malloc() pool