diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:46:37 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-12 23:46:37 +0100 |
| commit | 1ad98ad66e5bb8a46a186a92f180bb9592d47673 (patch) | |
| tree | 51b0ccc9f51f816ee926afed6c6e65aabf6c8df1 /include | |
| parent | 3e5ab1af245da25633954c5b51c85cc8da0a5036 (diff) | |
| parent | 1020286ef47bfa3b30430fbaa3f0dd464ff6eb9e (diff) | |
| download | u-boot-imx-1ad98ad66e5bb8a46a186a92f180bb9592d47673.zip u-boot-imx-1ad98ad66e5bb8a46a186a92f180bb9592d47673.tar.gz u-boot-imx-1ad98ad66e5bb8a46a186a92f180bb9592d47673.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 75e4e07..090ab3b 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -137,14 +137,14 @@ /* global pointer */ /* start of global data */ #define CONFIG_SYS_GBL_DATA_OFFSET \ - (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE \ - - GENERATED_GBL_DATA_SIZE) + (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE) /* monitor code */ #define SIZE 0x40000 -#define CONFIG_SYS_MONITOR_LEN (SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_MONITOR_LEN SIZE #define CONFIG_SYS_MONITOR_BASE \ - (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN) + (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \ + - CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE) #define CONFIG_SYS_MONITOR_END \ (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) #define CONFIG_SYS_MALLOC_LEN SIZE |