From 29cf5d590c76ef157d9697a5871b12b8af770f00 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Mon, 7 Nov 2011 22:00:13 +0000 Subject: [PATCH] Restructure libs source to support multi platform The "libstm32l_discovery" was actually the ST std periph library, plus the CMSIS core files. Renamed it as such, and restructured the directories and naming to make this easier to contain the std periph drivers for more than just one board. Verified with the LCD demo makefile, and loading it in sram again. --- example/lcd/Makefile | 21 +++++--- example/libs_stm/build/Makefile | 37 ++++++++++++++ .../inc/base/stdint.h | 0 .../inc/core_support/core_cm3.c | 0 .../inc/core_support/core_cm3.h | 0 .../inc/device_support/stm32l1xx.h | 0 .../inc/device_support/system_stm32l1xx.h | 0 .../inc => libs_stm/inc/stm32l1xx}/misc.h | 0 .../inc/stm32l1xx}/stm32l1xx_adc.h | 0 .../inc/stm32l1xx}/stm32l1xx_comp.h | 0 .../inc/stm32l1xx}/stm32l1xx_crc.h | 0 .../inc/stm32l1xx}/stm32l1xx_dac.h | 0 .../inc/stm32l1xx}/stm32l1xx_dbgmcu.h | 0 .../inc/stm32l1xx}/stm32l1xx_dma.h | 0 .../inc/stm32l1xx}/stm32l1xx_exti.h | 0 .../inc/stm32l1xx}/stm32l1xx_flash.h | 0 .../inc/stm32l1xx}/stm32l1xx_gpio.h | 0 .../inc/stm32l1xx}/stm32l1xx_i2c.h | 0 .../inc/stm32l1xx}/stm32l1xx_iwdg.h | 0 .../inc/stm32l1xx}/stm32l1xx_lcd.h | 0 .../inc/stm32l1xx}/stm32l1xx_pwr.h | 0 .../inc/stm32l1xx}/stm32l1xx_rcc.h | 0 .../inc/stm32l1xx}/stm32l1xx_rtc.h | 0 .../inc/stm32l1xx}/stm32l1xx_spi.h | 0 .../inc/stm32l1xx}/stm32l1xx_syscfg.h | 0 .../inc/stm32l1xx}/stm32l1xx_tim.h | 0 .../inc/stm32l1xx}/stm32l1xx_usart.h | 0 .../inc/stm32l1xx}/stm32l1xx_wwdg.h | 0 .../src => libs_stm/src/stm32l1xx}/misc.c | 0 .../src/stm32l1xx}/stm32l1xx_adc.c | 0 .../src/stm32l1xx}/stm32l1xx_comp.c | 0 .../src/stm32l1xx}/stm32l1xx_crc.c | 0 .../src/stm32l1xx}/stm32l1xx_dac.c | 0 .../src/stm32l1xx}/stm32l1xx_dbgmcu.c | 0 .../src/stm32l1xx}/stm32l1xx_dma.c | 0 .../src/stm32l1xx}/stm32l1xx_exti.c | 0 .../src/stm32l1xx}/stm32l1xx_flash.c | 0 .../src/stm32l1xx}/stm32l1xx_flash_ramfunc.c | 0 .../src/stm32l1xx}/stm32l1xx_gpio.c | 0 .../src/stm32l1xx}/stm32l1xx_i2c.c | 0 .../src/stm32l1xx}/stm32l1xx_iwdg.c | 0 .../src/stm32l1xx}/stm32l1xx_lcd.c | 0 .../src/stm32l1xx}/stm32l1xx_pwr.c | 0 .../src/stm32l1xx}/stm32l1xx_rcc.c | 0 .../src/stm32l1xx}/stm32l1xx_rtc.c | 0 .../src/stm32l1xx}/stm32l1xx_spi.c | 0 .../src/stm32l1xx}/stm32l1xx_syscfg.c | 0 .../src/stm32l1xx}/stm32l1xx_tim.c | 0 .../src/stm32l1xx}/stm32l1xx_usart.c | 0 .../src/stm32l1xx}/stm32l1xx_wwdg.c | 0 example/libstm32l_discovery/build/Makefile | 51 ------------------- 51 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 example/libs_stm/build/Makefile rename example/{libstm32l_discovery => libs_stm}/inc/base/stdint.h (100%) rename example/{libstm32l_discovery => libs_stm}/inc/core_support/core_cm3.c (100%) rename example/{libstm32l_discovery => libs_stm}/inc/core_support/core_cm3.h (100%) rename example/{libstm32l_discovery => libs_stm}/inc/device_support/stm32l1xx.h (100%) rename example/{libstm32l_discovery => libs_stm}/inc/device_support/system_stm32l1xx.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/misc.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_adc.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_comp.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_crc.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_dac.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_dbgmcu.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_dma.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_exti.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_flash.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_gpio.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_i2c.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_iwdg.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_lcd.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_pwr.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_rcc.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_rtc.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_spi.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_syscfg.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_tim.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_usart.h (100%) rename example/{libstm32l_discovery/inc => libs_stm/inc/stm32l1xx}/stm32l1xx_wwdg.h (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/misc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_adc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_comp.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_crc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_dac.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_dbgmcu.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_dma.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_exti.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_flash.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_flash_ramfunc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_gpio.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_i2c.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_iwdg.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_lcd.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_pwr.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_rcc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_rtc.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_spi.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_syscfg.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_tim.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_usart.c (100%) rename example/{libstm32l_discovery/src => libs_stm/src/stm32l1xx}/stm32l1xx_wwdg.c (100%) delete mode 100644 example/libstm32l_discovery/build/Makefile diff --git a/example/lcd/Makefile b/example/lcd/Makefile index 0f31ae6..8bfdbbb 100644 --- a/example/lcd/Makefile +++ b/example/lcd/Makefile @@ -7,11 +7,20 @@ CFLAGS+=-mcpu=cortex-m3 -ffreestanding -nostdlib -nostdinc CFLAGS+=-I. -# stm32l_discovery lib -CFLAGS+=-I../libstm32l_discovery/inc -CFLAGS+=-I../libstm32l_discovery/inc/base -CFLAGS+=-I../libstm32l_discovery/inc/core_support -CFLAGS+=-I../libstm32l_discovery/inc/device_support + +PLATFORM=stm32l1xx +LIBS_STM_PATH=../libs_stm + +INC_CORE_SUPPORT=$(LIBS_STM_PATH)/inc/core_support +SRC_CORE_SUPPORT=$(LIBS_STM_PATH)/inc/core_support +INC_DEVICE_SUPPORT=$(LIBS_STM_PATH)/inc/device_support +INC_PLATFORM=$(LIBS_STM_PATH)/inc/$(PLATFORM) + +CFLAGS+=-I$(INC_CORE_SUPPORT) +CFLAGS+=-I$(INC_DEVICE_SUPPORT) +CFLAGS+=-I$(INC_PLATFORM) +CFLAGS+=-I$(LIBS_STM_PATH)/inc/base + # to run from SRAM CFLAGS+=-Wl,-T,linker_stm32l.lds @@ -25,7 +34,7 @@ OBJS=$(SRCS:.c=.o) all: $(ELF) $(ELF): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) -L../libstm32l_discovery/build -lstm32l_discovery + $(CC) $(CFLAGS) -o $@ $(OBJS) -L$(LIBS_STM_PATH)/build -lstm32l_discovery %.o: %.c $(CC) $(CFLAGS) -c -o $@ $^ diff --git a/example/libs_stm/build/Makefile b/example/libs_stm/build/Makefile new file mode 100644 index 0000000..d96e48c --- /dev/null +++ b/example/libs_stm/build/Makefile @@ -0,0 +1,37 @@ +LIB = libstm32l_discovery.a + +CC = arm-none-eabi-gcc +AR = arm-none-eabi-ar +RANLIB = arm-none-eabi-ranlib + +PLATFORM=stm32l1xx + +INC_CORE_SUPPORT=../inc/core_support +SRC_CORE_SUPPORT=../inc/core_support +INC_DEVICE_SUPPORT=../inc/device_support +INC_PLATFORM=../inc/$(PLATFORM) +SRC_PLATFORM=../src/$(PLATFORM) + +CFLAGS = -Wall -O2 -mlittle-endian -mthumb +CFLAGS += -mcpu=cortex-m3 -ffreestanding -nostdlib -nostdinc +CFLAGS += -I$(INC_PLATFORM) -I$(INC_DEVICE_SUPPORT) -I$(INC_CORE_SUPPORT) -I../inc/base + +SRCS=$(wildcard $(SRC_PLATFORM)/*.c) +SRCS+=$(SRC_CORE_SUPPORT)/core_cm3.c + +OBJS = $(SRCS:.c=.o) + +all: $(LIB) + +$(LIB): $(OBJS) + $(AR) -r $(LIB) $(OBJS) + $(RANLIB) $(LIB) + +%.o : %.c + $(CC) $(CFLAGS) -c -o $@ $^ + +clean: + -rm -f $(OBJS) + -rm -f $(LIB) + +.PHONY: all clean diff --git a/example/libstm32l_discovery/inc/base/stdint.h b/example/libs_stm/inc/base/stdint.h similarity index 100% rename from example/libstm32l_discovery/inc/base/stdint.h rename to example/libs_stm/inc/base/stdint.h diff --git a/example/libstm32l_discovery/inc/core_support/core_cm3.c b/example/libs_stm/inc/core_support/core_cm3.c similarity index 100% rename from example/libstm32l_discovery/inc/core_support/core_cm3.c rename to example/libs_stm/inc/core_support/core_cm3.c diff --git a/example/libstm32l_discovery/inc/core_support/core_cm3.h b/example/libs_stm/inc/core_support/core_cm3.h similarity index 100% rename from example/libstm32l_discovery/inc/core_support/core_cm3.h rename to example/libs_stm/inc/core_support/core_cm3.h diff --git a/example/libstm32l_discovery/inc/device_support/stm32l1xx.h b/example/libs_stm/inc/device_support/stm32l1xx.h similarity index 100% rename from example/libstm32l_discovery/inc/device_support/stm32l1xx.h rename to example/libs_stm/inc/device_support/stm32l1xx.h diff --git a/example/libstm32l_discovery/inc/device_support/system_stm32l1xx.h b/example/libs_stm/inc/device_support/system_stm32l1xx.h similarity index 100% rename from example/libstm32l_discovery/inc/device_support/system_stm32l1xx.h rename to example/libs_stm/inc/device_support/system_stm32l1xx.h diff --git a/example/libstm32l_discovery/inc/misc.h b/example/libs_stm/inc/stm32l1xx/misc.h similarity index 100% rename from example/libstm32l_discovery/inc/misc.h rename to example/libs_stm/inc/stm32l1xx/misc.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_adc.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_adc.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_adc.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_adc.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_comp.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_comp.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_comp.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_comp.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_crc.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_crc.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_crc.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_crc.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_dac.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_dac.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_dac.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_dac.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_dbgmcu.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_dbgmcu.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_dbgmcu.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_dbgmcu.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_dma.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_dma.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_dma.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_dma.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_exti.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_exti.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_exti.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_exti.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_flash.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_flash.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_flash.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_flash.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_gpio.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_gpio.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_gpio.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_gpio.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_i2c.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_i2c.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_i2c.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_i2c.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_iwdg.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_iwdg.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_iwdg.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_iwdg.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_lcd.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_lcd.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_lcd.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_lcd.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_pwr.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_pwr.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_pwr.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_pwr.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_rcc.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_rcc.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_rcc.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_rcc.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_rtc.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_rtc.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_rtc.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_rtc.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_spi.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_spi.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_spi.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_spi.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_syscfg.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_syscfg.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_syscfg.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_syscfg.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_tim.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_tim.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_tim.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_tim.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_usart.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_usart.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_usart.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_usart.h diff --git a/example/libstm32l_discovery/inc/stm32l1xx_wwdg.h b/example/libs_stm/inc/stm32l1xx/stm32l1xx_wwdg.h similarity index 100% rename from example/libstm32l_discovery/inc/stm32l1xx_wwdg.h rename to example/libs_stm/inc/stm32l1xx/stm32l1xx_wwdg.h diff --git a/example/libstm32l_discovery/src/misc.c b/example/libs_stm/src/stm32l1xx/misc.c similarity index 100% rename from example/libstm32l_discovery/src/misc.c rename to example/libs_stm/src/stm32l1xx/misc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_adc.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_adc.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_adc.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_adc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_comp.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_comp.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_comp.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_comp.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_crc.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_crc.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_crc.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_crc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_dac.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_dac.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_dac.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_dac.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_dbgmcu.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_dbgmcu.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_dbgmcu.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_dbgmcu.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_dma.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_dma.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_dma.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_dma.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_exti.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_exti.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_exti.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_exti.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_flash.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_flash.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_flash.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_flash.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_flash_ramfunc.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_flash_ramfunc.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_flash_ramfunc.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_flash_ramfunc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_gpio.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_gpio.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_gpio.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_gpio.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_i2c.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_i2c.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_i2c.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_i2c.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_iwdg.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_iwdg.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_iwdg.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_iwdg.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_lcd.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_lcd.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_lcd.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_lcd.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_pwr.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_pwr.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_pwr.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_pwr.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_rcc.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_rcc.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_rcc.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_rcc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_rtc.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_rtc.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_rtc.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_rtc.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_spi.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_spi.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_spi.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_spi.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_syscfg.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_syscfg.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_syscfg.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_syscfg.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_tim.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_tim.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_tim.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_tim.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_usart.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_usart.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_usart.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_usart.c diff --git a/example/libstm32l_discovery/src/stm32l1xx_wwdg.c b/example/libs_stm/src/stm32l1xx/stm32l1xx_wwdg.c similarity index 100% rename from example/libstm32l_discovery/src/stm32l1xx_wwdg.c rename to example/libs_stm/src/stm32l1xx/stm32l1xx_wwdg.c diff --git a/example/libstm32l_discovery/build/Makefile b/example/libstm32l_discovery/build/Makefile deleted file mode 100644 index 09d3b71..0000000 --- a/example/libstm32l_discovery/build/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -LIB = libstm32l_discovery.a - -CC = arm-none-eabi-gcc -AR = arm-none-eabi-ar -RANLIB = arm-none-eabi-ranlib - -CFLAGS = -Wall -O2 -mlittle-endian -mthumb -CFLAGS += -mcpu=cortex-m3 -ffreestanding -nostdlib -nostdinc -CFLAGS += -I../inc -I../inc/device_support -I../inc/core_support -I../inc/base - -SRCS = \ -../src/misc.c \ -../src/stm32l1xx_adc.c \ -../src/stm32l1xx_comp.c \ -../src/stm32l1xx_crc.c \ -../src/stm32l1xx_dac.c \ -../src/stm32l1xx_dbgmcu.c \ -../src/stm32l1xx_dma.c \ -../src/stm32l1xx_exti.c \ -../src/stm32l1xx_flash.c \ -../src/stm32l1xx_flash_ramfunc.c \ -../src/stm32l1xx_gpio.c \ -../src/stm32l1xx_i2c.c \ -../src/stm32l1xx_iwdg.c \ -../src/stm32l1xx_lcd.c \ -../src/stm32l1xx_pwr.c \ -../src/stm32l1xx_rcc.c \ -../src/stm32l1xx_rtc.c \ -../src/stm32l1xx_spi.c \ -../src/stm32l1xx_syscfg.c \ -../src/stm32l1xx_tim.c \ -../src/stm32l1xx_usart.c \ -../src/stm32l1xx_wwdg.c \ -../inc/core_support/core_cm3.c - -OBJS = $(SRCS:.c=.o) - -all: $(LIB) - -$(LIB): $(OBJS) - $(AR) -r $(LIB) $(OBJS) - $(RANLIB) $(LIB) - -%.o : %.c - $(CC) $(CFLAGS) -c -o $@ $^ - -clean: - -rm -f $(OBJS) - -rm -f $(LIB) - -.PHONY: all clean -- 2.47.2