diff --git a/trunk/bootrom/build/libraries/init/ARM11/crt0_secure.c b/trunk/bootrom/build/libraries/init/ARM11/crt0_secure.c index 78aadb5..fb8d11b 100644 --- a/trunk/bootrom/build/libraries/init/ARM11/crt0_secure.c +++ b/trunk/bootrom/build/libraries/init/ARM11/crt0_secure.c @@ -336,7 +336,7 @@ void stupInitMMUTable( void ) { *table++ = HW_MMU6_T2_LP_PACK( paddr, - HW_MMU6_T2_APX_ALL, + HW_MMU6_T2_APX_S_RW_U_NA, HW_MMU6_T2_LP_RGT_L1L2C_WB_WA, HW_MMU6_T2_GLOBAL, FALSE, @@ -353,7 +353,7 @@ void stupInitMMUTable( void ) *table++ = HW_MMU6_T1_SUSEC_PACK( paddr, - HW_MMU6_T1_APX_ALL, + HW_MMU6_T1_APX_S_RW_U_NA, HW_MMU6_T1_RGT_SHARED_DEV, HW_MMU6_T1_GLOBAL, FALSE, @@ -367,7 +367,7 @@ void stupInitMMUTable( void ) paddr = HW_MPCORE_REG; *table++ = HW_MMU6_T1_SEC_PACK( paddr, - HW_MMU6_T1_APX_ALL, + HW_MMU6_T1_APX_S_RW_U_NA, HW_MMU6_T1_RGT_NSHARED_DEV, HW_MMU6_T1_GLOBAL, FALSE, @@ -380,7 +380,7 @@ void stupInitMMUTable( void ) { *table++ = HW_MMU6_T1_SEC_PACK( paddr, - HW_MMU6_T1_APX_ALL, + HW_MMU6_T1_APX_S_RW_U_NA, HW_MMU6_T1_RGT_L1L2C_WB_WA, HW_MMU6_T1_GLOBAL, FALSE, @@ -399,19 +399,19 @@ void stupInitMMUTable( void ) { *table++ = HW_MMU6_T2_LP_PACK( paddr, - HW_MMU6_T2_APX_ALL, + HW_MMU6_T2_APX_S_RW_U_NA, HW_MMU6_T2_LP_RGT_L1L2C_WB_WA, HW_MMU6_T2_GLOBAL, FALSE, FALSE); paddr += HW_MMU6_T2_LP_ALIAS_SIZE; } - for ( paddr = HW_BROM_MMU_TBL; paddr < HW_AXI_WRAM_SHARED_END; ) + for ( ; paddr < HW_AXI_WRAM_SHARED_END; ) { *table++ = HW_MMU6_T2_LP_PACK( paddr, - HW_MMU6_T2_APX_ALL, - HW_MMU6_T1_RGT_SHARED_DEV, + HW_MMU6_T2_APX_S_RW_U_NA, + HW_MMU6_T2_LP_RGT_SHARED_DEV, HW_MMU6_T2_GLOBAL, FALSE, FALSE); @@ -422,7 +422,20 @@ void stupInitMMUTable( void ) // Main Memory Region (128MB cached) table = &t1Base[HW_MAIN_MEM/HW_MMU6_T1_SEC_SIZE]; - for ( paddr = HW_MAIN_MEM; paddr < HW_MAIN_MEM_EX_END; ) + for ( paddr = HW_MAIN_MEM; paddr < HW_MAIN_MEM_END; ) + { + + *table++ = HW_MMU6_T1_SUSEC_PACK( + paddr, + HW_MMU6_T1_APX_S_RW_U_NA, + HW_MMU6_T1_RGT_L1L2C_WB_WA, + HW_MMU6_T1_GLOBAL, + FALSE, + FALSE + ); + paddr += HW_MMU6_T1_SEC_SIZE; + } + for ( ; paddr < HW_MAIN_MEM_EX_END; ) { *table++ = HW_MMU6_T1_SUSEC_PACK(