From e5f4d2bec8ca74a82bf7de099c4ee6c90aa4f4dc Mon Sep 17 00:00:00 2001 From: Rasmus Melchior Jacobsen Date: Tue, 7 Feb 2023 14:23:33 +0100 Subject: [PATCH 1/2] Incorrect bump of fmc version - it was only fsmc that was incremented --- src/chips.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chips.rs b/src/chips.rs index f33a369..22f3d51 100644 --- a/src/chips.rs +++ b/src/chips.rs @@ -294,11 +294,11 @@ impl PeriMatcher { ("STM32F[24].*:ETH:.*", ("eth", "v1b", "ETH")), ("STM32F7.*:ETH:.*", ("eth", "v1c", "ETH")), (".*ETH:ethermac110_v3_0", ("eth", "v2", "ETH")), - ("STM32F4[0123].*:FS?MC:.*", ("fmc", "v2x3", "FMC")), - ("STM32F446.*:FMC:.*", ("fmc", "v3x1", "FMC")), - ("STM32F469.*:FMC:.*", ("fmc", "v3x1", "FMC")), - ("STM32F7.*:FMC:.*", ("fmc", "v3x1", "FMC")), - ("STM32H7.*:FMC:.*", ("fmc", "v4x1", "FMC")), + ("STM32F4[0123].*:FS?MC:.*", ("fmc", "v1x3", "FMC")), + ("STM32F446.*:FMC:.*", ("fmc", "v2x1", "FMC")), + ("STM32F469.*:FMC:.*", ("fmc", "v2x1", "FMC")), + ("STM32F7.*:FMC:.*", ("fmc", "v2x1", "FMC")), + ("STM32H7.*:FMC:.*", ("fmc", "v3x1", "FMC")), ("STM32F100.*:FSMC:.*", ("fsmc", "v1x0", "FSMC")), ("STM32F10[12357].*:FSMC:.*", ("fsmc", "v1x3", "FSMC")), ("STM32F2.*:FSMC:.*", ("fsmc", "v1x3", "FSMC")), From 13b6a5877017b6ecd4aefc24083d832f33bf3b0e Mon Sep 17 00:00:00 2001 From: Rasmus Melchior Jacobsen Date: Tue, 7 Feb 2023 14:36:37 +0100 Subject: [PATCH 2/2] stm32l1 uses fsmc v1x0 --- data/registers/fsmc_v1x0.yaml | 1 + src/chips.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/registers/fsmc_v1x0.yaml b/data/registers/fsmc_v1x0.yaml index b31e75c..516aaa7 100644 --- a/data/registers/fsmc_v1x0.yaml +++ b/data/registers/fsmc_v1x0.yaml @@ -1,4 +1,5 @@ # stm32f100 +# stm32l1 --- block/FSMC: description: Flexible static memory controller diff --git a/src/chips.rs b/src/chips.rs index 22f3d51..54f72f6 100644 --- a/src/chips.rs +++ b/src/chips.rs @@ -303,7 +303,7 @@ impl PeriMatcher { ("STM32F10[12357].*:FSMC:.*", ("fsmc", "v1x3", "FSMC")), ("STM32F2.*:FSMC:.*", ("fsmc", "v1x3", "FSMC")), ("STM32F3.*:FSMC:.*", ("fsmc", "v2x3", "FSMC")), - ("STM32L1.*:FSMC:.*", ("fsmc", "v1x1", "FSMC")), + ("STM32L1.*:FSMC:.*", ("fsmc", "v1x0", "FSMC")), ("STM32L4.*:FSMC:.*", ("fsmc", "v3x1", "FSMC")), ("STM32G4.*:FSMC:.*", ("fsmc", "v4x1", "FSMC")), ("STM32L5.*:FSMC:.*", ("fsmc", "v4x1", "FSMC")),