diff options
| author | hathach <[email protected]> | 2021-11-07 17:45:16 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-11-08 16:41:29 +0700 |
| commit | 91646d039c7dac8e16042c42c2d7197034111aeb (patch) | |
| tree | cea9ea783756114236c93af5d53ddedb84ea0656 /hw/bsp | |
| parent | 23e6e0ef335fac28dc7731a62cca05f838a78caa (diff) | |
add flash-openocd target. correct ek-tm4c123 button state
Diffstat (limited to 'hw/bsp')
| -rw-r--r-- | hw/bsp/ek-tm4c123gxl/board.mk | 35 | ||||
| -rw-r--r-- | hw/bsp/ek-tm4c123gxl/tm4c123gxl.c | 6 |
2 files changed, 17 insertions, 24 deletions
diff --git a/hw/bsp/ek-tm4c123gxl/board.mk b/hw/bsp/ek-tm4c123gxl/board.mk index f6522dc2c..368e79f4e 100644 --- a/hw/bsp/ek-tm4c123gxl/board.mk +++ b/hw/bsp/ek-tm4c123gxl/board.mk @@ -1,4 +1,3 @@ - DEPS_SUBMODULES += hw/mcu/ti CFLAGS += \ @@ -12,39 +11,29 @@ CFLAGS += \ -uvectors \ -DTM4C123GH6PM -# lpc_types.h cause following errors -CFLAGS += -Wno-error=strict-prototypes +# mcu driver cause following warnings +CFLAGS += -Wno-error=strict-prototypes -Wno-error=cast-qual MCU_DIR=hw/mcu/ti/tm4c123xx/ -CMSIS=$(TOP)/hw/mcu/ti/tm4c123xx/CMSIS/5.7.0/CMSIS/Include - -TI_HDR=$(TOP)/hw/mcu/ti/tm4c123xx/Include/TM4C123/ - # All source paths should be relative to the top level. - -LD_FILE = hw/bsp/$(BOARD)/tm4c123.ld +LD_FILE = $(BOARD_PATH)/tm4c123.ld INC += \ - $(CMSIS) \ - $(TI_HDR) \ - $(TOP)/hw/bsp - + $(TOP)/$(MCU_DIR)/CMSIS/5.7.0/CMSIS/Include \ + $(TOP)/$(MCU_DIR)/Include/TM4C123 \ + $(TOP)/hw/bsp SRC_C += \ - $(MCU_DIR)/Source/system_TM4C123.c \ - $(MCU_DIR)/Source/GCC/tm4c123_startup.c - -# For TinyUSB port source -VENDOR = ti -CHIP_FAMILY = tm4c123xx + $(MCU_DIR)/Source/system_TM4C123.c \ + $(MCU_DIR)/Source/GCC/tm4c123_startup.c # For freeRTOS port source FREERTOS_PORT = ARM_CM4F # For flash-jlink target -JLINK_DEVICE = LPC1769 +JLINK_DEVICE = TM4C123GH6PM -# flash using jlink -flash: $(BUILD)/$(PROJECT).elf - openocd -f board/ti_ek-tm4c123gxl.cfg -c "program $< verify reset exit" +# flash using openocd +OPENOCD_OPTION = -f board/ti_ek-tm4c123gxl.cfg +flash: flash-openocd diff --git a/hw/bsp/ek-tm4c123gxl/tm4c123gxl.c b/hw/bsp/ek-tm4c123gxl/tm4c123gxl.c index d78b0f7e3..b370b7577 100644 --- a/hw/bsp/ek-tm4c123gxl/tm4c123gxl.c +++ b/hw/bsp/ek-tm4c123gxl/tm4c123gxl.c @@ -3,9 +3,12 @@ #define BOARD_UART UART0 #define BOARD_UART_PORT GPIOA + #define BOARD_BTN_PORT GPIOF #define BOARD_BTN 4 #define BOARD_BTN_Msk (1u<<4) +#define BUTTON_STATE_ACTIVE 0 + #define LED_PORT GPIOF #define LED_PIN_RED 1 #define LED_PIN_BLUE 2 @@ -125,7 +128,8 @@ void board_led_write(bool state) uint32_t board_button_read(void) { - return ReadGPIOPin(BOARD_BTN_PORT, BOARD_BTN_Msk); + uint32_t gpio_value = ReadGPIOPin(BOARD_BTN_PORT, BOARD_BTN_Msk); + return BUTTON_STATE_ACTIVE ? gpio_value : !gpio_value; } int board_uart_write(void const* buf, int len) |