summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/as3525/memory-init.S2
-rw-r--r--firmware/target/arm/tms320dm320/system-dm320.c2
-rw-r--r--utils/zenutils/libraries/zlib123/zlib/inflate.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/memory-init.S b/firmware/target/arm/as3525/memory-init.S
index fbc11e5c56..e45e28a608 100644
--- a/firmware/target/arm/as3525/memory-init.S
+++ b/firmware/target/arm/as3525/memory-init.S
@@ -98,7 +98,7 @@ memory_init:
mov r1, #0x82 @ SDRAM MODE, MPMCCLKOUT runs continuously
str r1, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL
- ldr r1, =DRAM_ORIG+(0x2300*MEM)
+ ldr r1, =DRAM_ORIG+(0x2300*MEMORYSIZE)
ldr r1, [r1]
str r2, [r3, #0x20] @ MPMC_DYNAMIC_CONTROL= SDRAM NORMAL,
diff --git a/firmware/target/arm/tms320dm320/system-dm320.c b/firmware/target/arm/tms320dm320/system-dm320.c
index 7c4650468f..2d618a1b8b 100644
--- a/firmware/target/arm/tms320dm320/system-dm320.c
+++ b/firmware/target/arm/tms320dm320/system-dm320.c
@@ -308,7 +308,7 @@ void system_init(void)
map_section(0, 0, 0x1000, CACHE_NONE);
/* Enable caching for RAM */
- map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEM, CACHE_ALL);
+ map_section(CONFIG_SDRAM_START, CONFIG_SDRAM_START, MEMORYSIZE, CACHE_ALL);
/* enable buffered writing for the framebuffer */
map_section((int)FRAME, (int)FRAME, LCD_TTB_AREA, BUFFERED);
#ifdef CREATIVE_ZVx
diff --git a/utils/zenutils/libraries/zlib123/zlib/inflate.c b/utils/zenutils/libraries/zlib123/zlib/inflate.c
index 792fdee8e9..c3e606812c 100644
--- a/utils/zenutils/libraries/zlib123/zlib/inflate.c
+++ b/utils/zenutils/libraries/zlib123/zlib/inflate.c
@@ -1134,7 +1134,7 @@ int flush;
RESTORE();
if (state->wsize || (state->mode < CHECK && out != strm->avail_out))
if (updatewindow(strm, out)) {
- state->mode = MEM;
+ state->mode = MEMORYSIZE;
return Z_MEM_ERROR;
}
in -= strm->avail_in;
@@ -1190,7 +1190,7 @@ uInt dictLength;
/* copy dictionary to window */
if (updatewindow(strm, strm->avail_out)) {
- state->mode = MEM;
+ state->mode = MEMORYSIZE;
return Z_MEM_ERROR;
}
if (dictLength > state->wsize) {