aboutsummaryrefslogtreecommitdiff
path: root/include/libopencm3/stm32
diff options
context:
space:
mode:
authorKarl Palsson2013-02-25 05:38:50 -0800
committerKarl Palsson2013-02-25 05:38:50 -0800
commite62f0e10f37fa7e2fa63b4d552e4c245298daae2 (patch)
treec6951068c3f624468c0b3ba9d5beefc05c4c7d68 /include/libopencm3/stm32
parent9e24b33d90e7e30233c65ca0c26fd7d2049f93d0 (diff)
parent0dbcf69d41d104c16858fd4dc43c4b23b7dcd3da (diff)
Merge pull request #100 from alex-n-/master
stm32f4 forgotten can.o in Makefile. fix sdio base adress stm32f2/stm32f4
Diffstat (limited to 'include/libopencm3/stm32')
-rw-r--r--include/libopencm3/stm32/f2/memorymap.h2
-rw-r--r--include/libopencm3/stm32/f4/memorymap.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/libopencm3/stm32/f2/memorymap.h b/include/libopencm3/stm32/f2/memorymap.h
index b316be2..f888443 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 */
diff --git a/include/libopencm3/stm32/f4/memorymap.h b/include/libopencm3/stm32/f4/memorymap.h
index 7625838..01728df 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 */