Skip to content

Commit

Permalink
Merge pull request #13 from robertlipe/clean_ca
Browse files Browse the repository at this point in the history
Clean whitespace in customer_apps
  • Loading branch information
YafeiJin authored Nov 10, 2020
2 parents 1ee9de9 + e82b9d7 commit fef645a
Show file tree
Hide file tree
Showing 111 changed files with 705 additions and 705 deletions.
2 changes: 1 addition & 1 deletion customer_app/benchmark_security_aes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $(info ****** Trying SDK PATH [$(BL60X_SDK_PATH)])
endif

COMPONENTS_BLSYS := bltime blfdt bloop loopadc looprt loopset
COMPONENTS_VFS :=
COMPONENTS_VFS :=

INCLUDE_COMPONENTS += freertos_riscv_ram bl602 bl602_std hal_drv vfs yloop lwip utils cli blog blog_testc mbedtls
INCLUDE_COMPONENTS += $(COMPONENTS_BLSYS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ void aes_ctr_test(uint32_t length, uint32_t count,
printf("CTR HW\r\n");
bl_aes_test(ptr, ptr, length, count, keytype, AES_CTR_MODE);
}

free_hw(ptr);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void *malloc_hw (size_t size, ram_type_t type)
if (p_heap_addr == NULL) {
return NULL;
}

ptr = NULL;
counts = 0;
while (1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def benchmark_security_aes_tc(env, extra_data):
dut.expect('Init CLI with event Driven', timeout=0.5)
print('BL602 CLI init done')
time.sleep(0.1)

for aes in ['ecb', 'cbc', 'ctr', 'gcm'] :
for key, keybit in enumerate(['128', '192', '256'], 1) :
for ram, ramtype in enumerate(['dtcm', 'ocram', 'wram'], 0) :
Expand All @@ -42,11 +42,11 @@ def benchmark_security_aes_tc(env, extra_data):
dut.write('test_aes_gmac 32768 256 0')
speed = dut.expect(re.compile(r"aes encrypt speed is (.+)\r"), timeout=30)
print('aes gmac hw dtcm test done speed is : {}'.format(speed[0]))

dut.write('test_aes_gmac 32768 256 1')
speed = dut.expect(re.compile(r"aes encrypt speed is (.+)\r"), timeout=30)
print('aes gmac hw ocram test done speed is : {}'.format(speed[0]))

dut.write('test_aes_gmac 32768 256 2')
speed = dut.expect(re.compile(r"aes encrypt speed is (.+)\r"), timeout=30)
print('aes gmac hw wram test done speed is : {}'.format(speed[0]))
Expand Down
4 changes: 2 additions & 2 deletions customer_app/bl602_boot2/bl602_boot2/BLSP_Boot2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ MODULE_OUT_DIR:= $(TARGET_OUT_PATH)/$(MODULE_DIR)
$(MODULE_OUT_DIR)/%.o: LOCAL_CFLAGS:= -DBLSP_BOOT2_ROLLBACK -O2
$(MODULE_OUT_DIR)/%.o: LOCAL_INCLUDE:= -I$(MODULE_DIR)

LOCAL_COM_SRCS_FILE:=
local_com_objs := $(subst .c,.o,$(LOCAL_COM_SRCS_FILE))
LOCAL_COM_SRCS_FILE:=
local_com_objs := $(subst .c,.o,$(LOCAL_COM_SRCS_FILE))

$(MODULE_OUT_DIR)/%.o:$(MODULE_DIR)/%.c
@mkdir -p $(dir $@)
Expand Down
4 changes: 2 additions & 2 deletions customer_app/bl602_boot2/bl602_boot2/blsp_boot2.c
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,9 @@ int main(void)
MSG_DBG("MCU SDK:%s\r\n",MCU_SDK_VERSION);
MSG_DBG("BSP:%s\r\n",BSP_VERSION);
#endif
if(BLSP_Boot2_Dump_Critical_Flag()){
if(BLSP_Boot2_Dump_Critical_Flag()){
BLSP_Dump_Data(&clkCfg,16);
BLSP_Dump_Data(&flashCfg,16);
BLSP_Dump_Data(&flashCfg,16);
}

MSG_DBG("Get efuse config\r\n");
Expand Down
72 changes: 36 additions & 36 deletions customer_app/bl602_boot2/bl602_boot2/blsp_boot2_flash.ld
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ SECTIONS
{
. = ALIGN(4);
__text_code_start__ = .;

KEEP (*(.text.metal.init.enter))
KEEP (*(SORT_NONE(.init)))

*(.text)
*(.text.*)

/*put .rodata**/
*(EXCLUDE_FILE( *bl602_glb.o \
*bl602_pds.o \
Expand All @@ -53,34 +53,34 @@ SECTIONS
*bl602_ef_ctrl.o) .rodata*)
*(.rodata)
*(.rodata.*)

*(.srodata)
*(.srodata.*)

. = ALIGN(4);
__text_code_end__ = .;
} > xip_memory

. = ALIGN(4);
__itcm_load_addr = .;

.itcm_region : AT (__itcm_load_addr)
{
. = ALIGN(4);
__tcm_code_start__ = .;

*(.tcm_code)
*(.tcm_const)
*(.sclock_rlt_code)
*(.sclock_rlt_const)

*bl602_romapi.o(.text)
*bl602_romapi.o(.text.*)
*bl602_romapi.o(.rodata)
*bl602_romapi.o(.rodata.*)
*bl602_romapi.o(.srodata)
*bl602_romapi.o(.srodata.*)

*bl602_glb.o*(.rodata*)
*bl602_pds.o*(.rodata*)
*bl602_common.o*(.rodata*)
Expand All @@ -89,24 +89,24 @@ SECTIONS
*bl602_sflash.o*(.rodata*)
*bl602_xip_sflash.o*(.rodata*)
*bl602_ef_ctrl.o*(.rodata*)

. = ALIGN(4);
__tcm_code_end__ = .;
} > itcm_memory

__dtcm_load_addr = __itcm_load_addr + SIZEOF(.itcm_region);

.dtcm_region : AT (__dtcm_load_addr)
{
. = ALIGN(4);
__tcm_data_start__ = .;

*(.tcm_data)

. = ALIGN(4);
__tcm_data_end__ = .;
} > dtcm_memory

/*************************************************************************/
/* .stack_dummy section doesn't contains any symbols. It is only
* used for linker to calculate size of stack sections, and assign
Expand All @@ -117,59 +117,59 @@ SECTIONS
. = . + StackSize;
. = ALIGN(0x4);
} > dtcm_memory

/* Set stack top to end of RAM, and stack limit move down by
* size of stack_dummy section */
__StackTop = ORIGIN(dtcm_memory) + LENGTH(dtcm_memory);
__StackLimit = __StackTop - SIZEOF(.stack_dummy);

/* Check if data + heap + stack exceeds RAM limit */
ASSERT(__StackLimit >= __tcm_data_end__, "region RAM overflowed with stack")
/*************************************************************************/

__system_ram_load_addr = __dtcm_load_addr + SIZEOF(.dtcm_region);

.system_ram_data_region : AT (__system_ram_load_addr)
{
. = ALIGN(4);
__system_ram_data_start__ = .;

*(.system_ram)

. = ALIGN(4);
__system_ram_data_end__ = .;
} > ram_memory

__ram_load_addr = __system_ram_load_addr + SIZEOF(.system_ram_data_region);

/* Data section */
RAM_DATA : AT (__ram_load_addr)
{
. = ALIGN(4);
__ram_data_start__ = .;

PROVIDE( __global_pointer$ = . + 0x800 );

*(.data)
*(.data.*)
*(.sdata)
*(.sdata.*)
*(.sdata2)
*(.sdata2.*)

. = ALIGN(4);
__ram_data_end__ = .;
} > ram_memory

.bss (NOLOAD) :
{
. = ALIGN(4);
__bss_start__ = .;

*(.bss*)
*(.sbss*)
*(COMMON)

. = ALIGN(4);
__bss_end__ = .;
} > ram_memory
Expand All @@ -178,25 +178,25 @@ SECTIONS
{
. = ALIGN(4);
__noinit_data_start__ = .;

*(.noinit_data*)

. = ALIGN(4);
__noinit_data_end__ = .;
} > ram_memory

.heap (NOLOAD):
{
. = ALIGN(4);
__HeapBase = .;

/*__end__ = .;*/
/*end = __end__;*/
KEEP(*(.heap*))

. = ALIGN(4);
__HeapLimit = .;
} > ram_memory

}

2 changes: 1 addition & 1 deletion customer_app/bl602_boot2/bl602_boot2/blsp_boot_decompress.c
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int32_t BLSP_Boot2_Fw_Decompress(uint32_t srcAddress,uint32_t destAddress
struct xz_buf b;
struct xz_dec *s;
enum xz_ret ret;

*pDestSize=0;
if(destMaxSize>0){
XIP_SFlash_Erase_Need_Lock(&flashCfg,destAddress,destAddress+destMaxSize-1);
Expand Down
Empty file modified customer_app/bl602_boot2/bl602_boot2/blsp_boot_decompress.h
100755 → 100644
Empty file.
Loading

0 comments on commit fef645a

Please sign in to comment.