X-Git-Url: https://git.karo-electronics.de/?p=karo-tx-redboot.git;a=blobdiff_plain;f=packages%2Fhal%2Farm%2Fmx25%2Fkaro%2Fv1_0%2Fsrc%2Fredboot_cmds.c;h=457f331c974c61d8a2b2e3de6512b1871dd8d859;hp=8eff72c1f1fcb55b9d033bd0974b9c1992748f45;hb=180ccf89a5ded9754f2cf2b1fff49e4ce086df1e;hpb=90030eb5f15e1119b6f08463856ac32794d1c3e2 diff --git a/packages/hal/arm/mx25/karo/v1_0/src/redboot_cmds.c b/packages/hal/arm/mx25/karo/v1_0/src/redboot_cmds.c index 8eff72c1..457f331c 100644 --- a/packages/hal/arm/mx25/karo/v1_0/src/redboot_cmds.c +++ b/packages/hal/arm/mx25/karo/v1_0/src/redboot_cmds.c @@ -62,16 +62,16 @@ static void runImg(int argc, char *argv[]); static void do_mem(int argc, char *argv[]); RedBoot_cmd("mem", - "Set a memory location", - "[-h|-b] [-n] [-a
] ", - do_mem - ); + "Set a memory location", + "[-h|-b] [-n] [-a
] ", + do_mem + ); RedBoot_cmd("run", - "Run an image at a location with MMU off", - "[]", - runImg - ); + "Run an image at a location with MMU off", + "[]", + runImg + ); static void do_mem(int argc, char *argv[]) { @@ -113,7 +113,7 @@ static void do_mem(int argc, char *argv[]) diag_printf(" Set 0x%08lX to 0x%02X\n", address, value); } else { diag_printf(" Set 0x%08lX to 0x%02X (result 0x%02X)\n", - address, value, (int)*(cyg_uint8*)address ); + address, value, (int)*(cyg_uint8*)address ); } } else if (mem_half_word) { if (address & 1) { @@ -125,7 +125,7 @@ static void do_mem(int argc, char *argv[]) diag_printf(" Set 0x%08lX to 0x%04X\n", address, value); } else { diag_printf(" Set 0x%08lX to 0x%04X (result 0x%04X)\n", - address, value, (int)*(cyg_uint16*)address); + address, value, (int)*(cyg_uint16*)address); } } } else { @@ -137,7 +137,7 @@ static void do_mem(int argc, char *argv[]) diag_printf(" Set 0x%08lX to 0x%08X\n", address, value); } else { diag_printf(" Set 0x%08lX to 0x%08X (result 0x%08X)\n", - address, value, (int)*(cyg_uint32*)address); + address, value, (int)*(cyg_uint32*)address); } } } @@ -145,18 +145,18 @@ static void do_mem(int argc, char *argv[]) void launchRunImg(unsigned long addr) { - asm volatile ("mov r12, r0;"); - HAL_MMU_OFF(); - asm volatile ( - "mov r0, #0;" - "mov r1, r12;" - "mov r11, #0;" - "mov r12, #0;" - "mrs r10, cpsr;" - "bic r10, r10, #0xF0000000;" - "msr cpsr_f, r10;" - "mov pc, r1" - ); + asm volatile ("mov r12, r0;"); + HAL_MMU_OFF(); + asm volatile ( + "mov r0, #0;" + "mov r1, r12;" + "mov r11, #0;" + "mov r12, #0;" + "mrs r10, cpsr;" + "bic r10, r10, #0xF0000000;" + "msr cpsr_f, r10;" + "mov pc, r1" + ); } static void runImg(int argc,char *argv[]) @@ -170,7 +170,7 @@ static void runImg(int argc,char *argv[]) virt_addr = entry_address; if (!scan_opts(argc, argv, 1, 0, 0, &virt_addr, - OPTION_ARG_TYPE_NUM, "virtual address")) + OPTION_ARG_TYPE_NUM, "virtual address")) return; if (entry_address != 0xFFFFFFFF) @@ -186,10 +186,10 @@ static void runImg(int argc,char *argv[]) #if defined(CYGSEM_REDBOOT_FLASH_CONFIG) && defined(CYG_HAL_STARTUP_ROMRAM) RedBoot_cmd("romupdate", - "Update Redboot with currently running image", - "", - romupdate - ); + "Update Redboot with currently running image", + "", + romupdate + ); #ifdef CYGPKG_IO_FLASH void romupdate(int argc, char *argv[]) @@ -203,14 +203,14 @@ void romupdate(int argc, char *argv[]) // Erase area to be programmed if ((stat = flash_erase(base_addr, CYGBLD_REDBOOT_MIN_IMAGE_SIZE, &err_addr)) != 0) { diag_printf("Can't erase region at %p: %s\n", - err_addr, flash_errmsg(stat)); + err_addr, flash_errmsg(stat)); return; } // Now program it if ((stat = flash_program(base_addr, ram_end, CYGBLD_REDBOOT_MIN_IMAGE_SIZE, &err_addr)) != 0) { diag_printf("Can't program region at %p: %s\n", - err_addr, flash_errmsg(stat)); + err_addr, flash_errmsg(stat)); } } #endif //CYGPKG_IO_FLASH