From 1d7759dbd0ebcfbc99b8c0951bd555be3b27085d Mon Sep 17 00:00:00 2001 From: Kinjal Pravinbhai Patel Date: Thu, 11 Sep 2014 14:47:33 +0530 Subject: [PATCH] BSP: modified translation table for armcc and iar compiler cortexa9 This patch modifies translation table entries in armcc/translation_table.s and iccarm/translation_table.s to fix the compilation error Signed-off-by: Kinjal Pravinbhai Patel --- lib/bsp/standalone/src/changelog.txt | 3 +++ .../src/cortexa9/armcc/translation_table.s | 16 +++++++++------- .../src/cortexa9/iccarm/translation_table.s | 12 +++++++----- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lib/bsp/standalone/src/changelog.txt b/lib/bsp/standalone/src/changelog.txt index 7739b97e..f985a091 100755 --- a/lib/bsp/standalone/src/changelog.txt +++ b/lib/bsp/standalone/src/changelog.txt @@ -206,4 +206,7 @@ * armcc/translation_table.s and iccarm/translation_table.s * to properly defined reserved entries according to address map for * fixing CR#820146 + * 4.2 pkp 09/11/14 modified translation table entries in cortexa9/iccarm/translation_table.s + * and cortexa9/armcc/translation_table.s to resolve compilation + * error for solving CR#822897 ******************************************************************************************/ diff --git a/lib/bsp/standalone/src/cortexa9/armcc/translation_table.s b/lib/bsp/standalone/src/cortexa9/armcc/translation_table.s index a96630f5..2c50673e 100755 --- a/lib/bsp/standalone/src/cortexa9/armcc/translation_table.s +++ b/lib/bsp/standalone/src/cortexa9/armcc/translation_table.s @@ -46,6 +46,8 @@ ; 3.07a sgd 07/05/2012 Configuring device address spaces as shareable device ; instead of strongly-ordered. ; 4.2 pkp 09/02/14 modified translation table entries according to address map +; 4.2 pkp 09/11/14 modified translation table entries to resolve compilation +; error for solving CR#822897 ; ; ; @note @@ -132,11 +134,11 @@ count SETA count+1 WEND ; 0xe4000000 - 0xe5ffffff (SRAM) - count SETA 0 +count SETA 0 WHILE count<0x20 DCD sect + 0xc0e ; S=b0 TEX=b000 AP=b11, Domain=b0, C=b1, B=b1 - sect SETA sect+0x100000 - count SETA count+1 +sect SETA sect+0x100000 +count SETA count+1 WEND ; 0xe6000000 - 0xf7ffffff (reserved) @@ -168,11 +170,11 @@ count SETA count+1 WEND ; 0xfc000000 - 0xfdffffff (QSPI) - count SETA 0 +count SETA 0 WHILE count<0x20 DCD sect + 0xc0a ; S=b0 TEX=b000 AP=b11, Domain=b0, C=b1, B=b1 - sect SETA sect+0x100000 - count SETA count+1 +sect SETA sect+0x100000 +count SETA count+1 WEND ; 0xfe000000 - 0xffefffff (reserved) @@ -188,7 +190,7 @@ count SETA count+1 ; 0xfff00000 to 0xfffb0000 (OCM) count SETA 0 -DCD sect + 0x4c0e ; S=b0 TEX=b100 AP=b11, Domain=b0, C=b1, B=b1 + DCD sect + 0x4c0e ; S=b0 TEX=b100 AP=b11, Domain=b0, C=b1, B=b1 sect SETA sect+0x100000 END diff --git a/lib/bsp/standalone/src/cortexa9/iccarm/translation_table.s b/lib/bsp/standalone/src/cortexa9/iccarm/translation_table.s index 8c7da500..8fa0112a 100755 --- a/lib/bsp/standalone/src/cortexa9/iccarm/translation_table.s +++ b/lib/bsp/standalone/src/cortexa9/iccarm/translation_table.s @@ -45,6 +45,8 @@ ; 3.07a sgd 07/05/12 Configuring device address spaces as shareable device ; instead of strongly-ordered. ; 4.2 pkp 09/02/14 modified translation table entries according to address map +; 4.2 pkp 09/11/14 modified translation table entries to resolve compilation +; error for solving CR#822897 ; ; ; @note @@ -106,11 +108,11 @@ count SETA count+1 ENDR ; 0xe0300000 - 0xe0ffffff (undef/reserved) - count SETA 0 +count SETA 0 REPT 0xD DCD sect ; S=0, TEX=b000 AP=b00, Domain=b0, C=b0, B=b0 - sect SETA sect+0x100000 - count SETA count+1 +sect SETA sect+0x100000 +count SETA count+1 ENDR ; 0xe1000000 - 0xe1ffffff (NAND) @@ -185,8 +187,8 @@ count SETA count+1 ; 1MB, it is not possible to define separate region for it ; 0xfff00000 to 0xfffb0000 (OCM) - count SETA 0 +count SETA 0 DCD sect + 0x4c0e ; S=b0 TEX=b100 AP=b11, Domain=b0, C=b1, B=b1 - sect SETA sect+0x100000 +sect SETA sect+0x100000 END