summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Palsson <karlp@tweak.net.au>2022-01-12 17:31:01 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2022-01-26 23:40:29 +0100
commit114eab5a0b5aa3f97ead07edabcfc93ee99b19d2 (patch)
treee4ae24a5e1545cb9404beecc6ca463181de0c86b
parent3d4618b786594af253a2cf972452e79ae230eccc (diff)
platforms/stm32/wb: sort existing peripherals
Makes merging and diffing easier later.
-rw-r--r--.gitignore2
-rw-r--r--SConscript2
-rw-r--r--platforms/stm32/wb.yaml26
3 files changed, 15 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index f024703..533147e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ docs
# Generated source files:
ld_scripts/generated.ld
dma/dma.h
+gpio/gpio.h
interrupt/interrupt.h
interrupt/interrupt_enums.h
interrupt/default_handlers.cpp
@@ -14,7 +15,6 @@ interrupt/vectors_*.cpp
rcc/flash.h
rcc/rcc.h
rcc/rcc_enums.h
-gpio/gpio.h
timer/timer.h
usb/usb.h
uart/uart.h
diff --git a/SConscript b/SConscript
index be66bfe..d30eb4f 100644
--- a/SConscript
+++ b/SConscript
@@ -8,9 +8,9 @@ env.SConscript('ld_scripts/SConscript')
env.Append(
LIB_SOURCES = [
env.SConscript('dma/SConscript'),
+ env.SConscript('gpio/SConscript'),
env.SConscript('interrupt/SConscript'),
env.SConscript('rcc/SConscript'),
- env.SConscript('gpio/SConscript'),
env.SConscript('timer/SConscript'),
env.SConscript('uart/SConscript'),
env.SConscript('usb/SConscript'),
diff --git a/platforms/stm32/wb.yaml b/platforms/stm32/wb.yaml
index 06e03da..251e369 100644
--- a/platforms/stm32/wb.yaml
+++ b/platforms/stm32/wb.yaml
@@ -28,6 +28,19 @@
size: 10k
periph:
+ stm32_dma:
+ DMA1:
+ type: v1
+ offset: 0x40020000
+ DMA2:
+ type: v1
+ offset: 0x40020400
+
+ stm32_dmamux:
+ DMAMUX1:
+ type: v1
+ offset: 0x40020800
+
stm32_flash:
FLASH:
type: wb
@@ -60,19 +73,6 @@
type: v2
offset: 0x40013800
- stm32_dma:
- DMA1:
- type: v1
- offset: 0x40020000
- DMA2:
- type: v1
- offset: 0x40020400
-
- stm32_dmamux:
- DMAMUX1:
- type: v1
- offset: 0x40020800
-
rcc:
RCC:
offset: 0x58000000