From e50ce6a876ae41f9bb27276c3b872d64a5e39f89 Mon Sep 17 00:00:00 2001 From: Marek Koza Date: Tue, 30 Apr 2019 20:47:14 +0200 Subject: [PATCH] stm32l4: Correct memorymap and add the existing CAN library --- include/libopencm3/stm32/l4/memorymap.h | 2 +- lib/stm32/l4/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libopencm3/stm32/l4/memorymap.h b/include/libopencm3/stm32/l4/memorymap.h index d8e12e53..40567a34 100644 --- a/include/libopencm3/stm32/l4/memorymap.h +++ b/include/libopencm3/stm32/l4/memorymap.h @@ -57,7 +57,7 @@ #define I2C2_BASE (PERIPH_BASE_APB1 + 0x5800) #define I2C3_BASE (PERIPH_BASE_APB1 + 0x5c00) #define CRS_BASE (PERIPH_BASE_APB1 + 0x6000) -#define CAN1_BASE (PERIPH_BASE_APB1 + 0x6400) +#define BX_CAN1_BASE (PERIPH_BASE_APB1 + 0x6400) #define USB_DEV_FS_BASE (PERIPH_BASE_APB1 + 0x6800) #define USB_PMA_BASE (PERIPH_BASE_APB1 + 0x6c00) #define POWER_CONTROL_BASE (PERIPH_BASE_APB1 + 0x7000) diff --git a/lib/stm32/l4/Makefile b/lib/stm32/l4/Makefile index a2748535..e0bed7c5 100644 --- a/lib/stm32/l4/Makefile +++ b/lib/stm32/l4/Makefile @@ -38,7 +38,7 @@ TGT_CFLAGS += $(STANDARD_FLAGS) ARFLAGS = rcs # Specific objs -OBJS = adc.o flash.o pwr.o rcc.o +OBJS = adc.o flash.o pwr.o rcc.o can.o # common/shared objs OBJS += rcc_common_all.o