summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2017-08-25 22:44:10 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2017-08-25 22:44:10 (GMT)
commitfdcf4f08a5eb2e0b8d9b23db5fdc6dddce668435 (patch)
tree01255cd400efeb35e73557761549057d0c8fadb7
parent0f62672e2808b08ca5c713f220d184bc9ccdc767 (diff)
rename external lib stdperiph to spl
-rw-r--r--README8
-rw-r--r--blink/Makefile6
-rw-r--r--contrib/Makefile4
-rw-r--r--defines.mk2
-rw-r--r--include.mk26
-rw-r--r--spl.mk (renamed from stdperiph.mk)8
6 files changed, 27 insertions, 27 deletions
diff --git a/README b/README
index bd19d28..e7e6b28 100644
--- a/README
+++ b/README
@@ -34,10 +34,10 @@ lib-led.c inside your project.
To use the STM8S StdPeriph Library in your project you have to provide the
path to the library source code. You may do this by calling `make` inside
-the contrib tree. But any external path is ok. In order to build the stdperiph
-object file the build system has to call `make clean` inside the STDPERIPH_PATH
-so make sure there is no build inside which you still need. Also paralell builds
-of several projects using the same STDPERIPH_PATH is not possible.
+the contrib tree. But any external path is ok. In order to build the spl
+object file the build system has to call `make clean` inside the SPL_PATH
+so make sure there is no build inside which you still need. Also paralell
+builds of several projects using the same SPL_PATH is not possible.
License
=======
diff --git a/blink/Makefile b/blink/Makefile
index b7e723c..8790c50 100644
--- a/blink/Makefile
+++ b/blink/Makefile
@@ -24,10 +24,10 @@ NAME := blink
BOARD_TYPE := test
OBJ := $(NAME).rel
LIBS := led
-EXTERNAL_LIBS := stdperiph
+EXTERNAL_LIBS := spl
SPREADSTM8_PATH := ..
-STDPERIPH_PATH := $(SPREADSTM8_PATH)/contrib/STM8S_StdPeriph_Lib
-STDPERIPH_COMPONENTS := gpio
+SPL_PATH := $(SPREADSTM8_PATH)/contrib/STM8S_StdPeriph_Lib
+SPL_COMPONENTS := gpio
include $(SPREADSTM8_PATH)/include.mk
diff --git a/contrib/Makefile b/contrib/Makefile
index 41e5352..c310b48 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -20,9 +20,9 @@
## along with spreadspace stm8 utils. If not, see <http://www.gnu.org/licenses/>.
##
-all: download-stdperiph update-stm8flash
+all: download-spl update-stm8flash
-download-stdperiph: stsw-stm8069.zip
+download-spl: stsw-stm8069.zip
stsw-stm8069.zip:
wget "http://www.st.com/st-web-ui/static/active/en/st_prod_software_internet/resource/technical/software/firmware/stsw-stm8069.zip" -O "$@"
diff --git a/defines.mk b/defines.mk
index b32a734..9262621 100644
--- a/defines.mk
+++ b/defines.mk
@@ -23,7 +23,7 @@
ifeq ($(BOARD_TYPE),test)
MCU := stm8s105c6
PROG := stm8flash
- STDPERIPH_MCU := STM8S105
+ SPL_MCU := STM8S105
endif
CC = sdcc
diff --git a/include.mk b/include.mk
index f782fc9..3c2509b 100644
--- a/include.mk
+++ b/include.mk
@@ -33,7 +33,7 @@ OBJ_LIB := $(LIBS:%=lib-%.rel)
SRC_LIB := $(LIBS:%=$(LIB_DIR)/%.c)
DEP_LIB := $(LIBS:%=lib-%.d)
-.PHONY: prepare clean clean-external distclean clean-stdperiph program erase flash reset run
+.PHONY: prepare clean clean-external distclean clean-spl program erase flash reset run
ELFFILE := $(NAME).elf
HEXFILE := $(NAME).hex
@@ -44,10 +44,10 @@ all: prepare $(HEXFILE)
## external Libs
LDFLAGS += -L./
-ifdef STDPERIPH_PATH
-CFLAGS += -D$(STDPERIPH_MCU)
+ifdef SPL_PATH
+CFLAGS += -D$(SPL_MCU)
CFLAGS += -I./
-CFLAGS += -I$(STDPERIPH_PATH)/Libraries/STM8S_StdPeriph_Driver/inc
+CFLAGS += -I$(SPL_PATH)/Libraries/STM8S_StdPeriph_Driver/inc
endif
prepare: $(EXTERNAL_LIBS:%=build-%)
@@ -55,25 +55,25 @@ clean-external: $(EXTERNAL_LIBS:%=clean-%)
export
-build-stdperiph: libstdperiph.a
+build-spl: libspl.a
-libstdperiph.a: Makefile
+libspl.a: Makefile
@echo ""
@echo "****************************************************"
- @echo "* building external STM8S StdPeriph lib ($(STDPERIPH_PATH))"
+ @echo "* building external STM8S StdPeriph lib ($(SPL_PATH))"
@echo ""
- make -f $(SPREADSTM8_PATH)/stdperiph.mk libstdperiph.a
- make -f $(SPREADSTM8_PATH)/stdperiph.mk clean
+ make -f $(SPREADSTM8_PATH)/spl.mk libspl.a
+ make -f $(SPREADSTM8_PATH)/spl.mk clean
@echo ""
@echo "****************************************************"
-clean-stdperiph:
+clean-spl:
@echo ""
@echo "****************************************************"
- @echo "cleaning external STM8S StdPeriph lib ($(STDPERIPH_PATH))"
+ @echo "cleaning external STM8S StdPeriph lib ($(SPL_PATH))"
@echo ""
- make -f $(SPREADSTM8_PATH)/stdperiph.mk clean
- rm -f libstdperiph.a
+ make -f $(SPREADSTM8_PATH)/spl.mk clean
+ rm -f libspl.a
@echo ""
@echo "****************************************************"
diff --git a/stdperiph.mk b/spl.mk
index 2ba1928..aa6121a 100644
--- a/stdperiph.mk
+++ b/spl.mk
@@ -21,14 +21,14 @@
##
include $(SPREADSTM8_PATH)/defines.mk
-CFLAGS += -D$(STDPERIPH_MCU)
-CFLAGS += -I$(STDPERIPH_PATH)/Libraries/STM8S_StdPeriph_Driver/inc
+CFLAGS += -D$(SPL_MCU)
+CFLAGS += -I$(SPL_PATH)/Libraries/STM8S_StdPeriph_Driver/inc
CFLAGS += -I./
-SRC:=$(STDPERIPH_COMPONENTS:%=$(STDPERIPH_PATH)/Libraries/STM8S_StdPeriph_Driver/src/stm8s_%.c)
+SRC:=$(SPL_COMPONENTS:%=$(SPL_PATH)/Libraries/STM8S_StdPeriph_Driver/src/stm8s_%.c)
OBJ = $(SRC:%.c=%.rel)
-libstdperiph.a: $(OBJ)
+libspl.a: $(OBJ)
$(AR) $@ $(OBJ)
%.rel: %.c