diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c index 273d1867d2..55a61490ef 100644 --- a/arch/z80/src/common/up_assert.c +++ b/arch/z80/src/common/up_assert.c @@ -88,19 +88,19 @@ static void _up_assert(int errorcode) /* noreturn_function */ if (up_interrupt_context() || running_task()->flink == NULL) { - up_irq_save(); - for (;;) - { + up_irq_save(); + for (; ; ) + { #if CONFIG_BOARD_RESET_ON_ASSERT >= 1 - board_reset(CONFIG_BOARD_ASSERT_RESET_VALUE); + board_reset(CONFIG_BOARD_ASSERT_RESET_VALUE); #endif #ifdef CONFIG_ARCH_LEDS - board_autoled_on(LED_PANIC); - up_mdelay(250); - board_autoled_off(LED_PANIC); - up_mdelay(250); + board_autoled_on(LED_PANIC); + up_mdelay(250); + board_autoled_off(LED_PANIC); + up_mdelay(250); #endif - } + } } else { @@ -190,6 +190,8 @@ void up_assert(void) syslog_flush(); #ifdef CONFIG_BOARD_CRASHDUMP + /* Execute board-specific crash dump logic */ + board_crashdump(Z80_getsp(), running_task(), filename, lineno); #endif diff --git a/boards/z80/ez80/z20x/scripts/z20x_copytoram.linkcmd b/boards/z80/ez80/z20x/scripts/z20x_copytoram.linkcmd index f7a9d39241..630b22c0d5 100644 --- a/boards/z80/ez80/z20x/scripts/z20x_copytoram.linkcmd +++ b/boards/z80/ez80/z20x/scripts/z20x_copytoram.linkcmd @@ -52,7 +52,7 @@ DEFINE __crtl = 1 DEFINE __CS0_LBR_INIT_PARAM = $04 DEFINE __CS0_UBR_INIT_PARAM = $0b -DEFINE __CS0_CTL_INIT_PARAM = $08 +DEFINE __CS0_CTL_INIT_PARAM = $28 DEFINE __CS0_BMC_INIT_PARAM = $00 DEFINE __CS1_LBR_INIT_PARAM = $00 DEFINE __CS1_UBR_INIT_PARAM = $00 diff --git a/boards/z80/ez80/z20x/scripts/z20x_flash.linkcmd b/boards/z80/ez80/z20x/scripts/z20x_flash.linkcmd index 0b28dccf74..dcb051959c 100644 --- a/boards/z80/ez80/z20x/scripts/z20x_flash.linkcmd +++ b/boards/z80/ez80/z20x/scripts/z20x_flash.linkcmd @@ -49,7 +49,7 @@ DEFINE __crtl = 1 DEFINE __CS0_LBR_INIT_PARAM = $04 DEFINE __CS0_UBR_INIT_PARAM = $0b -DEFINE __CS0_CTL_INIT_PARAM = $08 +DEFINE __CS0_CTL_INIT_PARAM = $28 DEFINE __CS0_BMC_INIT_PARAM = $00 DEFINE __CS1_LBR_INIT_PARAM = $00 DEFINE __CS1_UBR_INIT_PARAM = $00 diff --git a/boards/z80/ez80/z20x/scripts/z20x_loader.linkcmd b/boards/z80/ez80/z20x/scripts/z20x_loader.linkcmd index 06a0579586..a1d22325e4 100644 --- a/boards/z80/ez80/z20x/scripts/z20x_loader.linkcmd +++ b/boards/z80/ez80/z20x/scripts/z20x_loader.linkcmd @@ -56,7 +56,7 @@ DEFINE __progend = $0bffff DEFINE __CS0_LBR_INIT_PARAM = $04 DEFINE __CS0_UBR_INIT_PARAM = $0b -DEFINE __CS0_CTL_INIT_PARAM = $08 +DEFINE __CS0_CTL_INIT_PARAM = $28 DEFINE __CS0_BMC_INIT_PARAM = $00 DEFINE __CS1_LBR_INIT_PARAM = $00 DEFINE __CS1_UBR_INIT_PARAM = $00 diff --git a/boards/z80/ez80/z20x/scripts/z20x_program.linkcmd b/boards/z80/ez80/z20x/scripts/z20x_program.linkcmd index 5ee7d03f47..509cdc58a3 100644 --- a/boards/z80/ez80/z20x/scripts/z20x_program.linkcmd +++ b/boards/z80/ez80/z20x/scripts/z20x_program.linkcmd @@ -59,7 +59,7 @@ DEFINE __progend = $0bffff DEFINE __CS0_LBR_INIT_PARAM = $04 DEFINE __CS0_UBR_INIT_PARAM = $0b -DEFINE __CS0_CTL_INIT_PARAM = $08 +DEFINE __CS0_CTL_INIT_PARAM = $28 DEFINE __CS0_BMC_INIT_PARAM = $00 DEFINE __CS1_LBR_INIT_PARAM = $00 DEFINE __CS1_UBR_INIT_PARAM = $00