Unverified Commit cbfec1b7 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

stm32f: configurable "make cat" timeout

parent d168fce7

src/arch/stm32f446re-nucleo/Makefile.inc

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ COMMON_FLAGS += --static -nostartfiles -g3 -Os -fno-common 
COMMON_FLAGS += -ffunction-sections -fdata-sections

COMMON_FLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=hard -mfpu=fpv4-sp-d16 -DSTM32F4



MAKE_CAT_TIMEOUT ?= 3600



CC = arm-none-eabi-gcc

CXX = arm-none-eabi-g++

OBJCOPY = arm-none-eabi-objcopy
@@ -112,7 +114,7 @@ ext/libopencm3/lib/libopencm3_stm32f4.a: ext/libopencm3/Makefile 
program: build/system.elf

	openocd -c 'source [find interface/stlink.cfg]' \

		-c 'transport select hla_swd' -c 'source [find target/stm32f4x.cfg]' \

		-c 'reset_config srst_only' -c '$$_TARGETNAME configure -rtos auto' \

		-c 'reset_config srst_only' -c '$$_TARGETNAME configure -rtos none' \

		-c 'reset_config connect_assert_srst' -c init -c targets \

		-c 'reset halt' -c 'flash write_image erase "build/system.elf" 0' \

		-c 'verify_image "build/system.elf" 0' -c 'reset run' -c 'shutdown'

src/arch/stm32f746zg-nucleo/Makefile.inc

+6 −2
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
SERIAL_PORT ?= ttyACM0



cpu_freq ?= 216000000



# counter runs at cpu_freq/2

counter_freq ?= 108000000



INCLUDES += -Iext/libopencm3/include
@@ -15,6 +17,8 @@ COMMON_FLAGS += --static -nostartfiles -g3 -Os -fno-common 
COMMON_FLAGS += -ffunction-sections -fdata-sections

COMMON_FLAGS += -mcpu=cortex-m7 -mthumb -mfloat-abi=hard -mfpu=fpv5-sp-d16 -DSTM32F7



MAKE_CAT_TIMEOUT ?= 3600



CC = arm-none-eabi-gcc

CXX = arm-none-eabi-g++

OBJCOPY = arm-none-eabi-objcopy
@@ -109,7 +113,7 @@ ext/libopencm3/lib/libopencm3_stm32f7.a: ext/libopencm3/Makefile 
program: build/system.elf

	openocd -c 'source [find interface/stlink.cfg]' \

		-c 'transport select hla_swd' -c 'source [find target/stm32f7x.cfg]' \

		-c 'reset_config srst_only' -c '$$_TARGETNAME configure -rtos auto' \

		-c 'reset_config srst_only' -c '$$_TARGETNAME configure -rtos none' \

		-c 'reset_config connect_assert_srst' -c init -c targets \

		-c 'reset halt' -c 'flash write_image erase "build/system.elf" 0' \

		-c 'verify_image "build/system.elf" 0' -c 'reset run' -c 'shutdown'
@@ -118,7 +122,7 @@ arch_clean: 
	${QUIET}rm -f ${OBJECTS}



cat:

	${QUIET}script/cat.py /dev/${SERIAL_PORT} 115200 ${counter_freq} 4294967296

	${QUIET}script/cat.py /dev/${SERIAL_PORT} 115200 ${counter_freq} 4294967296 ${MAKE_CAT_TIMEOUT}



monitor:

	${QUIET}screen /dev/${SERIAL_PORT} 115200

src/arch/stm32f746zg-nucleo/arch.cc

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ void Arch::setup(void) 
#endif



#ifdef CONFIG_arch_stm32f746zg_nucleo_driver_counter

	// counter

	rcc_periph_clock_enable(RCC_TIM2);

	nvic_enable_irq(NVIC_TIM2_IRQ);

	rcc_periph_reset_pulse(RST_TIM2);