Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stm32h7: merge GPIO MPU regions. #1577

Merged
merged 1 commit into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/demo-stm32h7-nucleo/app-h743.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ name = "drv-stm32xx-sys"
features = ["h743"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/demo-stm32h7-nucleo/app-h753.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/gemini-bu/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/gimlet/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/gimletlet/app-mgmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/gimletlet/base-gimletlet2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/psc/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
2 changes: 1 addition & 1 deletion app/sidecar/base.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true
task-slots = ["jefe"]

Expand Down
12 changes: 2 additions & 10 deletions chips/stm32h7/chip.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,9 @@
address = 0x58024400
size = 1024

[gpios1]
[gpios]
address = 0x58020000
size = 0x2000

[gpios2]
address = 0x58022000
size = 0x0800

[gpios3]
address = 0x58022800
size = 0x0400
size = 0x4000

[spi1]
address = 0x40013000
Expand Down
2 changes: 1 addition & 1 deletion test/tests-psc/app.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ name = "drv-stm32xx-sys"
features = ["h753"]
priority = 1
max-sizes = {flash = 2048, ram = 1024}
uses = ["rcc", "gpios1", "gpios2", "gpios3", "system_flash"]
uses = ["rcc", "gpios", "system_flash"]
start = true

[tasks.i2c_driver]
Expand Down