From 5996ac606b4ab5538cf78f70d182cdf7e34778d2 Mon Sep 17 00:00:00 2001 From: Oliver Meier Date: Tue, 5 Jan 2016 18:20:52 +0100 Subject: [PATCH] tests: usb gadget0: Add stm32f429i-disco support The F429i board has the user USB OTG port connected to the HS capable OTG core, rather than the FS OTG core. It is still only operating in FS mode, as you need a ULPI phy to use HS mode. --- tests/gadget-zero/Makefile.stm32f429i-disco | 43 ++++++++++++++ tests/gadget-zero/main-stm32f429i-disco.c | 59 +++++++++++++++++++ .../gadget-zero/openocd.stm32f429i-disco.cfg | 13 ++++ tests/gadget-zero/test_gadget0.py | 1 + 4 files changed, 116 insertions(+) create mode 100644 tests/gadget-zero/Makefile.stm32f429i-disco create mode 100644 tests/gadget-zero/main-stm32f429i-disco.c create mode 100644 tests/gadget-zero/openocd.stm32f429i-disco.cfg diff --git a/tests/gadget-zero/Makefile.stm32f429i-disco b/tests/gadget-zero/Makefile.stm32f429i-disco new file mode 100644 index 00000000..4364778e --- /dev/null +++ b/tests/gadget-zero/Makefile.stm32f429i-disco @@ -0,0 +1,43 @@ +## +## This file is part of the libopencm3 project. +## +## This library is free software: you can redistribute it and/or modify +## it under the terms of the GNU Lesser General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see . +## + +BOARD = stm32f429i-disco +PROJECT = usb-gadget0-$(BOARD) +BUILD_DIR = bin-$(BOARD) + +SHARED_DIR = ../shared + +CFILES = main-$(BOARD).c +CFILES += usb-gadget0.c trace.c trace_stdio.c + +VPATH += $(SHARED_DIR) + +INCLUDES += $(patsubst %,-I%, . $(SHARED_DIR)) + +OPENCM3_DIR=../.. + +### This section can go to an arch shared rules eventually... +LDSCRIPT = ../../lib/stm32/f4/stm32f405x6.ld +OPENCM3_LIB = opencm3_stm32f4 +OPENCM3_DEFS = -DSTM32F4 +FP_FLAGS ?= -mfloat-abi=hard -mfpu=fpv4-sp-d16 +ARCH_FLAGS = -mthumb -mcpu=cortex-m4 $(FP_FLAGS) +#OOCD_INTERFACE = stlink-v2 +#OOCD_TARGET = stm32f4x +OOCD_FILE = openocd.$(BOARD).cfg + +include ../rules.mk diff --git a/tests/gadget-zero/main-stm32f429i-disco.c b/tests/gadget-zero/main-stm32f429i-disco.c new file mode 100644 index 00000000..f6ab881c --- /dev/null +++ b/tests/gadget-zero/main-stm32f429i-disco.c @@ -0,0 +1,59 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2015 Karl Palsson + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +#include +#include +#include + +#include +#include "usb-gadget0.h" + +#define ER_DEBUG +#ifdef ER_DEBUG +#define ER_DPRINTF(fmt, ...) \ + do { printf(fmt, ## __VA_ARGS__); } while (0) +#else +#define ER_DPRINTF(fmt, ...) \ + do { } while (0) +#endif + +int main(void) +{ + rcc_clock_setup_hse_3v3(&rcc_hse_8mhz_3v3[RCC_CLOCK_3V3_168MHZ]); + rcc_periph_clock_enable(RCC_GPIOB); + rcc_periph_clock_enable(RCC_OTGHS); + + gpio_mode_setup(GPIOB, GPIO_MODE_AF, GPIO_PUPD_NONE, + GPIO13 | GPIO14 | GPIO15); + gpio_set_af(GPIOB, GPIO_AF12, GPIO13 | GPIO14 | GPIO15); + + /* LEDS on discovery board */ + rcc_periph_clock_enable(RCC_GPIOD); + gpio_mode_setup(GPIOD, GPIO_MODE_OUTPUT, + GPIO_PUPD_NONE, GPIO12 | GPIO13 | GPIO14 | GPIO15); + + usbd_device *usbd_dev = gadget0_init(&otghs_usb_driver, "stm32f429i-disco"); + + ER_DPRINTF("bootup complete\n"); + while (1) { + usbd_poll(usbd_dev); + } + +} + diff --git a/tests/gadget-zero/openocd.stm32f429i-disco.cfg b/tests/gadget-zero/openocd.stm32f429i-disco.cfg new file mode 100644 index 00000000..42dede70 --- /dev/null +++ b/tests/gadget-zero/openocd.stm32f429i-disco.cfg @@ -0,0 +1,13 @@ +source [find interface/stlink-v2.cfg] +set WORKAREASIZE 0x4000 +source [find target/stm32f4x.cfg] + +# serial of "your" f429i disco board. +hla_serial "xxxxxW?k\x06IgHV0H\x10?" + +tpiu config internal swodump.stm32f429i-disco.log uart off 168000000 + +# Uncomment to reset on connect, for grabbing under WFI et al +reset_config srst_only srst_nogate +# reset_config srst_only srst_nogate connect_assert_srst + diff --git a/tests/gadget-zero/test_gadget0.py b/tests/gadget-zero/test_gadget0.py index 8aaef414..5648dfbb 100644 --- a/tests/gadget-zero/test_gadget0.py +++ b/tests/gadget-zero/test_gadget0.py @@ -6,6 +6,7 @@ import logging import unittest +#DUT_SERIAL = "stm32f429i-disco" DUT_SERIAL = "stm32f4disco" #DUT_SERIAL = "stm32f103-generic" #DUT_SERIAL = "stm32l1-generic"