projects
/
oweals
/
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-nds32
[oweals/u-boot.git]
/
include
/
configs
/
o2dnt.h
diff --git
a/include/configs/o2dnt.h
b/include/configs/o2dnt.h
index c9c69bbab6c66bed5e7af352fefceadfeaa6ee47..22eb0047f59ae33c0016fd910546d52aafa5c07f 100644
(file)
--- a/
include/configs/o2dnt.h
+++ b/
include/configs/o2dnt.h
@@
-65,7
+65,6
@@
#define CONFIG_SYS_XLB_PIPELINING 1
#define CONFIG_SYS_XLB_PIPELINING 1
-#define CONFIG_NET_MULTI 1
#define CONFIG_EEPRO100
#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
#define CONFIG_NS8382X 1
#define CONFIG_EEPRO100
#define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
#define CONFIG_NS8382X 1
@@
-214,11
+213,10
@@
/* Use SRAM until RAM will be available */
#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM
/* Use SRAM until RAM will be available */
#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM
-#define CONFIG_SYS_INIT_RAM_
END MPC5XXX_SRAM_SIZE /* End
of used area in DPRAM */
+#define CONFIG_SYS_INIT_RAM_
SIZE MPC5XXX_SRAM_SIZE /* Size
of used area in DPRAM */
-#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE