@@ -162,14 +162,14 @@ static rt_err_t _memblock_add_range(struct rt_memblock *memblock,
162162rt_err_t rt_memblock_add_memory (const char * name , rt_size_t start , rt_size_t end , mmblk_flag_t flags )
163163{
164164 LOG_D ("add physical address range [0x%.*lx-0x%.*lx) with flag 0x%x" \
165- " to overall memory regions\n " , MIN_BIT , base , MIN_BIT , base + size , flag );
165+ " to overall memory regions" , MIN_BIT , start , MIN_BIT , end , flags );
166166
167167 return _memblock_add_range (& mmblk_memory , name , start , end , flags );
168168}
169169
170170rt_err_t rt_memblock_reserve_memory (const char * name , rt_size_t start , rt_size_t end , mmblk_flag_t flags )
171171{
172- LOG_D ("add physical address range %s [0x%.*lx-0x%.*lx) to reserved memory regions\n " ,
172+ LOG_D ("add physical address range %s [0x%.*lx-0x%.*lx) to reserved memory regions" ,
173173 name , MIN_BIT , start , MIN_BIT , end );
174174
175175 return _memblock_add_range (& mmblk_reserved , name , start , end , flags );
@@ -389,7 +389,10 @@ void rt_memblock_setup_memory_environment(void)
389389 .map_size = reg .end - reg .start ,
390390 .prefer = (void * )reg .start };
391391
392- rt_aspace_map_phy (& rt_kernel_space , & hint , MMU_MAP_K_RWCB , (reg .start + PV_OFFSET ) >> MM_PAGE_SHIFT , & err );
392+ if (rt_aspace_map_phy (& rt_kernel_space , & hint , MMU_MAP_K_RWCB ,
393+ (reg .start + PV_OFFSET ) >> MM_PAGE_SHIFT , & err ))
394+ continue ;
395+
393396 rt_page_install (reg );
394397 mem += reg .end - reg .start ;
395398 }
0 commit comments