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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
pcm030.h
diff --git
a/include/configs/pcm030.h
b/include/configs/pcm030.h
index
5898b4e
..
1c4d722
100644
(file)
--- a/
include/configs/pcm030.h
+++ b/
include/configs/pcm030.h
@@
-223,12
+223,10
@@
RTC configuration
#define CONFIG_SYS_DEFAULT_MBAR 0x80000000
/* Use SRAM until RAM will be available */
#define CONFIG_SYS_INIT_RAM_ADDR MPC5XXX_SRAM
#define CONFIG_SYS_DEFAULT_MBAR 0x80000000
/* 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 */
+#define CONFIG_SYS_INIT_RAM_
SIZE MPC5XXX_SRAM_SIZE /* Size
of used */
/* area in DPRAM */
/* 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