summaryrefslogtreecommitdiff
path: root/lib_nios2/cache.S
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-18 21:59:44 +0200
committerWolfgang Denk <wd@denx.de>2008-10-18 21:59:44 +0200
commitf82642e33899766892499b163e60560fbbf87773 (patch)
treeab90f076f18e56b2b3e8c9375b95917daa78c1d9 /lib_nios2/cache.S
parentb59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff)
parent360fe71e82b83e264c964c9447c537e9a1f643c8 (diff)
downloadu-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip
u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz
u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2
Merge 'next' branch
Conflicts: board/freescale/mpc8536ds/mpc8536ds.c include/configs/mgcoge.h Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_nios2/cache.S')
-rw-r--r--lib_nios2/cache.S16
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