diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /lib_nios2/cache.S | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'lib_nios2/cache.S')
| -rw-r--r-- | lib_nios2/cache.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib_nios2/cache.S b/lib_nios2/cache.S index eb7735a..ee3b4b7 100644 --- a/lib_nios2/cache.S +++ b/lib_nios2/cache.S @@ -29,8 +29,8 @@ flush_dcache: add r5, r5, r4 - movhi r8, %hi(CFG_DCACHELINE_SIZE) - ori r8, r8, %lo(CFG_DCACHELINE_SIZE) + movhi r8, %hi(CONFIG_SYS_DCACHELINE_SIZE) + ori r8, r8, %lo(CONFIG_SYS_DCACHELINE_SIZE) 0: flushd 0(r4) add r4, r4, r8 bltu r4, r5, 0b @@ -41,8 +41,8 @@ flush_dcache: flush_icache: add r5, r5, r4 - movhi r8, %hi(CFG_ICACHELINE_SIZE) - ori r8, r8, %lo(CFG_ICACHELINE_SIZE) + movhi r8, %hi(CONFIG_SYS_ICACHELINE_SIZE) + ori r8, r8, %lo(CONFIG_SYS_ICACHELINE_SIZE) 1: flushi r4 add r4, r4, r8 bltu r4, r5, 1b @@ -55,16 +55,16 @@ flush_cache: mov r9, r4 mov r10, r5 - movhi r8, %hi(CFG_DCACHELINE_SIZE) - ori r8, r8, %lo(CFG_DCACHELINE_SIZE) + movhi r8, %hi(CONFIG_SYS_DCACHELINE_SIZE) + ori r8, r8, %lo(CONFIG_SYS_DCACHELINE_SIZE) 0: flushd 0(r4) add r4, r4, r8 bltu r4, r5, 0b mov r4, r9 mov r5, r10 - movhi r8, %hi(CFG_ICACHELINE_SIZE) - ori r8, r8, %lo(CFG_ICACHELINE_SIZE) + movhi r8, %hi(CONFIG_SYS_ICACHELINE_SIZE) + ori r8, r8, %lo(CONFIG_SYS_ICACHELINE_SIZE) 1: flushi r4 add r4, r4, r8 bltu r4, r5, 1b |