From aa54eae5be38bdfd4d412194bee325fab5477684 Mon Sep 17 00:00:00 2001 From: alexn Date: Mon, 25 Feb 2013 14:04:18 +0100 Subject: [PATCH 1/3] CAN support STM32F4 --- lib/stm32/f4/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index 8ff7c6a3..96e4420e 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -36,7 +36,8 @@ OBJS = rcc.o gpio.o flash.o exti2.o pwr.o timer.o \ gpio_common_all.o gpio_common_f24.o dma_common_f24.o spi_common_all.o \ dac_common_all.o usart_common_all.o iwdg_common_all.o i2c_common_all.o \ crc_common_all.o \ - rtc_common_bcd.o + rtc_common_bcd.o \ + can.o VPATH += ../../usb:../:../../cm3:../common From 3e587dce68995d7a4c479f19494c86c9a07a7fd2 Mon Sep 17 00:00:00 2001 From: alexn Date: Mon, 25 Feb 2013 14:07:51 +0100 Subject: [PATCH 2/3] fix stm32f4 sdio base adress --- include/libopencm3/stm32/f4/memorymap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libopencm3/stm32/f4/memorymap.h b/include/libopencm3/stm32/f4/memorymap.h index 76258382..01728df5 100644 --- a/include/libopencm3/stm32/f4/memorymap.h +++ b/include/libopencm3/stm32/f4/memorymap.h @@ -79,7 +79,7 @@ #define ADC3_BASE (PERIPH_BASE_APB2 + 0x2200) #define ADC_COMMON_BASE (PERIPH_BASE_APB2 + 0x2300) /* PERIPH_BASE_APB2 + 0x2400 (0x4001 2400 - 0x4001 27FF): Reserved */ -#define SDIO_BASE (PERIPH_BASE_APB2 + 0x2800) +#define SDIO_BASE (PERIPH_BASE_APB2 + 0x2C00) /* PERIPH_BASE_APB2 + 0x2C00 (0x4001 2C00 - 0x4001 2FFF): Reserved */ #define SPI1_BASE (PERIPH_BASE_APB2 + 0x3000) /* PERIPH_BASE_APB2 + 0x3400 (0x4001 3400 - 0x4001 37FF): Reserved */ From 0dbcf69d41d104c16858fd4dc43c4b23b7dcd3da Mon Sep 17 00:00:00 2001 From: alexn Date: Mon, 25 Feb 2013 14:08:53 +0100 Subject: [PATCH 3/3] fix stm32f2 sdio base adress --- include/libopencm3/stm32/f2/memorymap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libopencm3/stm32/f2/memorymap.h b/include/libopencm3/stm32/f2/memorymap.h index b316be28..f888443b 100644 --- a/include/libopencm3/stm32/f2/memorymap.h +++ b/include/libopencm3/stm32/f2/memorymap.h @@ -78,7 +78,7 @@ #define ADC2_BASE (PERIPH_BASE_APB2 + 0x2000) #define ADC3_BASE (PERIPH_BASE_APB2 + 0x2000) /* PERIPH_BASE_APB2 + 0x2400 (0x4001 2400 - 0x4001 27FF): Reserved */ -#define SDIO_BASE (PERIPH_BASE_APB2 + 0x2800) +#define SDIO_BASE (PERIPH_BASE_APB2 + 0x2C00) /* PERIPH_BASE_APB2 + 0x2C00 (0x4001 2C00 - 0x4001 2FFF): Reserved */ #define SPI1_BASE (PERIPH_BASE_APB2 + 0x3000) /* PERIPH_BASE_APB2 + 0x3400 (0x4001 3400 - 0x4001 37FF): Reserved */