From a17b4079ca6128b07774873ac2bbdbc181ec5ff7 Mon Sep 17 00:00:00 2001 From: Jerry Jacobs Date: Wed, 3 Aug 2016 20:27:30 +0200 Subject: [PATCH] Reorganise aux files, add sg test to CMakeLists --- .cproject | 593 ------------------------------------ .gitignore | 32 -- ChangeLog | 64 ---- ChangeLog.md | 65 +++- tests/CMakeLists.txt | 1 + tests/{stlink_sg.c => sg.c} | 12 +- 6 files changed, 66 insertions(+), 701 deletions(-) delete mode 100644 .cproject delete mode 100644 ChangeLog mode change 120000 => 100644 ChangeLog.md rename tests/{stlink_sg.c => sg.c} (95%) diff --git a/.cproject b/.cproject deleted file mode 100644 index ff034aaae..000000000 --- a/.cproject +++ /dev/null @@ -1,593 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -make -all -true -true -true - - -make -clean -true -true -true - - -make - -CONFIG_USE_LIBSG=0 -true -true -true - - -make -clean CONFIG_USE_LIBSG=0 -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make - -all -true -true -true - - -make - -clean -true -true -false - - -make - -all -true -true -true - - -make - -clean -true -true -true - - -make - -all -true -true -true - - -make - -clean -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -CONFIGURE_USE_LIBSG=0 -true -true -true - - -make - -clean CONFIG_USE_LIBSG=0 -true -true -true - - -make - -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make - -clean -true -true -true - - -make -all -true -true -true - - -make -clean -true -true -true - - -make - -CONFIG_USE_LIBSG=0 -true -true -true - - -make -clean -true -true -true - - -make -all -true -true -true - - -make -clean -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make - -all -true -true -true - - -make - -clean -true -true -false - - -make - -all -true -true -true - - -make - -clean -true -true -true - - -make -all -true -true -true - - -make -clean -true -true -true - - -make -all -true -true -true - - -make - -all -true -true -true - - -make - -clean -true -true -true - - -make - -CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - -make - -clean CONFIG_STM32F4_DISCOVERY=1 -true -true -true - - - - - - - - - diff --git a/.gitignore b/.gitignore index 1c8296454..378eac25d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,33 +1 @@ build -INSTALL -Makefile.in -aclocal.m4 -autom4te.cache -config.guess -config.sub -configure -depcomp -install-sh -ltmain.sh -missing -*.bz2 -*.lo -*.o -.libs -libtool -*.la -config.log -config.status -compile -st-flash -st-util -st-term -st-info -test_usb -test_sg -*.deps* -*.dirstamp -*.a -Makefile -*.exe -example/blink/*.elf diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 355ba08ab..000000000 --- a/ChangeLog +++ /dev/null @@ -1,64 +0,0 @@ -Stlink ChangeLog -================ - -v2.0.0 -====== - -Ongoing development - -Major changes: - -* Deprecation of autotools (autoconf, automake) - -v1.2.0 -====== - -Release date: 16 may 2016 - -Features added: - -* Add multiple stlink probing (`st-info --probe`, `st-info --hla-serial`) with printing serial in hex and OpenOCD `hla_serial` format (Jerry Jacobs) -* Add stlink usb probe API functions (Jerry Jacobs) -* Added parameter to specify one stlink v2 of many (Georg von Zengen) - -Changes: - -* Refactoring/fixes of flash loader (Maxime Coquelin) - -Updates and fixes: - -* Synchronize cache for stm32f7 (Tristan Gingold) -* Allow flashing of STM32L4 down to 1.71 V (Greg Meiste) -* Fix on stm32l4 to clear flash mass erase flags on CR (Bruno Dal Bo) -* Proper writing of page 0 of second bank for stm32l476xe (Tobias Badertscher) -* Trace the read data in stlink_read_debug32 and not the address of the variable (Tobias Badertscher) -* Mac OS X El Capitan platform support confirmation (Nikolay) -* Do not send a NUL at end of packets to gdb (Tristan Gingold) -* Correctly compute flash write size for partial pages (Dave Vandervies) -* _stlink_usb_reset use hardreset (mlundinse) -* Make sure MCU is halted before running RAM based flashloaders (mlundinse) -* Could not flash STM32_F3_SMALL (Max Chen) -* STM32F4 8-bit support for 1.8v operation (Andy Isaacson) -* Fix F2 memory map (Nicolas Schodet) -* Memory map for stm32f42xxx and stm32f43xxx devices (Craig Lilley) -* Stm32l0x flash loader (Robin Kreis) - -Chip support added for: - -* STM32L053R8 (Jean-Luc Béchennec) -* STM32F7 Support (mlundinse) -* Add STM32L4 to CHIPID #defines and devices[], flash driver and loaded (Dave Vandervies) -* Basic support for F446 (Pavel Kirienko) -* STM32F303 High Density -* STM32L1xx Cat.2 devices (Nicolas Schodet) - -Board support added for: - -* Nucleo-F303RE (Kyle Manna) -* Nucleo-F411RE (texane) - -Build system: - -* Travis: Initial support for Travis continues integration on Linux & Mac OS X (Jerry Jacobs) -* CMake: Document in README.md and add extra strict compiler flags (Jerry Jacobs) -* CMake: First stab at a cmake build (Josh Bialkowski) diff --git a/ChangeLog.md b/ChangeLog.md deleted file mode 120000 index b0936e8d0..000000000 --- a/ChangeLog.md +++ /dev/null @@ -1 +0,0 @@ -ChangeLog \ No newline at end of file diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 index 000000000..355ba08ab --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,64 @@ +Stlink ChangeLog +================ + +v2.0.0 +====== + +Ongoing development + +Major changes: + +* Deprecation of autotools (autoconf, automake) + +v1.2.0 +====== + +Release date: 16 may 2016 + +Features added: + +* Add multiple stlink probing (`st-info --probe`, `st-info --hla-serial`) with printing serial in hex and OpenOCD `hla_serial` format (Jerry Jacobs) +* Add stlink usb probe API functions (Jerry Jacobs) +* Added parameter to specify one stlink v2 of many (Georg von Zengen) + +Changes: + +* Refactoring/fixes of flash loader (Maxime Coquelin) + +Updates and fixes: + +* Synchronize cache for stm32f7 (Tristan Gingold) +* Allow flashing of STM32L4 down to 1.71 V (Greg Meiste) +* Fix on stm32l4 to clear flash mass erase flags on CR (Bruno Dal Bo) +* Proper writing of page 0 of second bank for stm32l476xe (Tobias Badertscher) +* Trace the read data in stlink_read_debug32 and not the address of the variable (Tobias Badertscher) +* Mac OS X El Capitan platform support confirmation (Nikolay) +* Do not send a NUL at end of packets to gdb (Tristan Gingold) +* Correctly compute flash write size for partial pages (Dave Vandervies) +* _stlink_usb_reset use hardreset (mlundinse) +* Make sure MCU is halted before running RAM based flashloaders (mlundinse) +* Could not flash STM32_F3_SMALL (Max Chen) +* STM32F4 8-bit support for 1.8v operation (Andy Isaacson) +* Fix F2 memory map (Nicolas Schodet) +* Memory map for stm32f42xxx and stm32f43xxx devices (Craig Lilley) +* Stm32l0x flash loader (Robin Kreis) + +Chip support added for: + +* STM32L053R8 (Jean-Luc Béchennec) +* STM32F7 Support (mlundinse) +* Add STM32L4 to CHIPID #defines and devices[], flash driver and loaded (Dave Vandervies) +* Basic support for F446 (Pavel Kirienko) +* STM32F303 High Density +* STM32L1xx Cat.2 devices (Nicolas Schodet) + +Board support added for: + +* Nucleo-F303RE (Kyle Manna) +* Nucleo-F411RE (texane) + +Build system: + +* Travis: Initial support for Travis continues integration on Linux & Mac OS X (Jerry Jacobs) +* CMake: Document in README.md and add extra strict compiler flags (Jerry Jacobs) +* CMake: First stab at a cmake build (Josh Bialkowski) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6f20fa922..5d114a608 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,6 @@ set(TESTS usb + sg ) foreach(test ${TESTS}) diff --git a/tests/stlink_sg.c b/tests/sg.c similarity index 95% rename from tests/stlink_sg.c rename to tests/sg.c index db7eed325..d12f6ba43 100644 --- a/tests/stlink_sg.c +++ b/tests/sg.c @@ -7,8 +7,7 @@ #include #include #include -#include "stlink-common.h" -#include "uglylogging.h" +#include static void __attribute__((unused)) mark_buf(stlink_t *sl) { memset(sl->q_buf, 0, sizeof(sl->q_buf)); @@ -165,15 +164,6 @@ int main(int argc, char *argv[]) { stlink_read_mem32(sl, 0x20000000, 1024 * 6); stlink_read_mem32(sl, 0x20000000 + 1024 * 6, 1024 * 2); #endif -#if 1 - reg regs; - stlink_read_all_regs(sl, ®s); - stlink_step(sl); - fputs("++++++++++ write r0 = 0x12345678\n", stderr); - stlink_write_reg(sl, 0x12345678, 0); - stlink_read_reg(sl, 0, ®s); - stlink_read_all_regs(sl, ®s); -#endif #if 0 stlink_run(sl); stlink_status(sl);