diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-04-09 17:00:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-04-09 17:00:45 +0200 |
| commit | 5c877b1ae0a4219ed6bd8d32cf3f7106b81ecb3b (patch) | |
| tree | cdcad9a534e5cd03a40c69bd51ab1b84d7092231 /include | |
| parent | 8ec57a9dc1de46836bf8f81f0911b4bc26e0e6c7 (diff) | |
| parent | bb60db634c26d609b289e114f44cc2c94ee64c4f (diff) | |
| download | u-boot-imx-5c877b1ae0a4219ed6bd8d32cf3f7106b81ecb3b.zip u-boot-imx-5c877b1ae0a4219ed6bd8d32cf3f7106b81ecb3b.tar.gz u-boot-imx-5c877b1ae0a4219ed6bd8d32cf3f7106b81ecb3b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nios
* 'master' of git://git.denx.de/u-boot-nios:
nios2 - adjust gbl data off to account for bd_info
nios2: implement get_ticks and get_tbclk
nios2: add flush_dcache_range function
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/nios2-generic.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 9ba35e8..17017a5 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -131,7 +131,8 @@ #define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - \ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_MALLOC_BASE - \ - GENERATED_GBL_DATA_SIZE) + GENERATED_GBL_DATA_SIZE - \ + GENERATED_BD_INFO_SIZE) #define CONFIG_SYS_INIT_SP CONFIG_SYS_GBL_DATA_OFFSET /* |