From b2f643d1da8e46c4b32f369f456f9ab9f73fdd93 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Wed, 9 Mar 2022 19:04:51 -0500 Subject: [PATCH] update Makefiles to use included submodules for STM32 platform files; --- .gitmodules | 6 ++++++ Makefile.STM32FX | 4 ++-- README.md | 8 +------- STM32F10X_Platform | 1 + STM32F4XX_Platform | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 .gitmodules create mode 160000 STM32F10X_Platform create mode 160000 STM32F4XX_Platform diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1a9aab1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "STM32F10X_Platform"] + path = STM32F10X_Platform + url = https://github.com/DVMProject/STM32F10X_Platform.git +[submodule "STM32F4XX_Platform"] + path = STM32F4XX_Platform + url = https://github.com/DVMProject/STM32F4XX_Platform.git diff --git a/Makefile.STM32FX b/Makefile.STM32FX index f036f16..645bb9e 100644 --- a/Makefile.STM32FX +++ b/Makefile.STM32FX @@ -1,6 +1,6 @@ # STM32 library paths -F1_LIB_PATH=/opt/tools/STM32F10X_Lib -F4_LIB_PATH=/opt/tools/STM32F4XX_Lib +F1_LIB_PATH=./STM32F10X_Platform +F4_LIB_PATH=./STM32F4XX_Platform # MCU external clock frequency (Hz) CLK_PI_F4=12000000 diff --git a/README.md b/README.md index 0ebb34c..a881096 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,7 @@ Please see the various Makefile's included in the project for more information. * Makefile.STM32FX - This makefile is used for targeting a generic STM32F103 with an ADF7021 RF SoC device. * For STM32F103 using Ubuntu OS install the standard ARM embedded toolchain (typically arm-gcc-none-eabi). - 1. Create a directory under "/opt" called "tools" and change to the directory: - ``` - mkdir -p /opt/tools - cd /opt/tools - ``` - 2. Checkout ```https://github.com/juribeparada/STM32F10X_Lib``` to /opt/tools: - ```git clone https://github.com/juribeparada/STM32F10X_Lib``` + - Make sure to clone this repository with the ```--recursive``` option, otherwise the STM32 platform files will be missing! Use the ```make``` command to build the firmware, choosing the appropriate makefile with the -F switch. diff --git a/STM32F10X_Platform b/STM32F10X_Platform new file mode 160000 index 0000000..527fee7 --- /dev/null +++ b/STM32F10X_Platform @@ -0,0 +1 @@ +Subproject commit 527fee72ae2291486304380cb812c48f36122c32 diff --git a/STM32F4XX_Platform b/STM32F4XX_Platform new file mode 160000 index 0000000..b8b3d53 --- /dev/null +++ b/STM32F4XX_Platform @@ -0,0 +1 @@ +Subproject commit b8b3d5380fba8beaa9afe79917ac0dda2a8e7a86