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
Convert CONFIG_SYS_FLASH_ERASE_TOUT et al to Kconfig
[platform/kernel/u-boot.git]
/
include
/
configs
/
MCR3000.h
diff --git
a/include/configs/MCR3000.h
b/include/configs/MCR3000.h
index
01b33c7
..
f6854cb
100644
(file)
--- a/
include/configs/MCR3000.h
+++ b/
include/configs/MCR3000.h
@@
-70,8
+70,6
@@
/* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MAX_FLASH_SECT 35
/* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MAX_FLASH_SECT 35
-#define CONFIG_SYS_FLASH_ERASE_TOUT 120000
-#define CONFIG_SYS_FLASH_WRITE_TOUT 500
/*
* For booting Linux, the board info and command line data
/*
* For booting Linux, the board info and command line data
@@
-86,7
+84,6
@@
/* environment is in FLASH */
/* Ethernet configuration part */
/* environment is in FLASH */
/* Ethernet configuration part */
-#define CONFIG_SYS_DISCOVER_PHY 1
/* NAND configuration part */
#define CONFIG_SYS_MAX_NAND_DEVICE 1
/* NAND configuration part */
#define CONFIG_SYS_MAX_NAND_DEVICE 1