From 2acb6a4682ac9627554bf330f5cbab2016353754 Mon Sep 17 00:00:00 2001 From: Taylor Carpenter Date: Sat, 27 Jan 2024 00:43:53 -0500 Subject: [PATCH 1/2] Fix crc version mapping CRC version mapping is now done by family before failing back to the IP version listed in MCU XML Versions now match what is on spreadsheet --- stm32-data-gen/src/chips.rs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs index c68fb43..3b1828e 100644 --- a/stm32-data-gen/src/chips.rs +++ b/stm32-data-gen/src/chips.rs @@ -471,13 +471,15 @@ impl PeriMatcher { (".*:FDCAN:fdcan1_v1_[01].*", ("can", "fdcan_v1", "FDCAN")), ("STM32H7.*:FDCANRAM.*", ("fdcanram", "h7", "FDCANRAM")), (".*:FDCANRAM.*", ("fdcanram", "v1", "FDCANRAM")), - // # stm32F4 CRC peripheral - // # ("STM32F4*:CRC:CRC:crc_f4") - // # v1: F1, F2, F4, L1 - // # v2, adds INIT reg: F0 - // # v3, adds POL reg: F3, F7, G0, G4, H7, L0, L4, L5, WB, WL - (".*:CRC:integtest1_v1_0", ("crc", "v1", "CRC")), - ("STM32L[04].*:CRC:integtest1_v2_0", ("crc", "v3", "CRC")), + ("STM32F[124].*:CRC:.*", ("crc", "v1", "CRC")), + ("STM32L1.*:CRC:.*", ("crc", "v1", "CRC")), + ("STM32F0.*:CRC:.*", ("crc", "v2", "CRC")), + ("STM32F[37].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32G[04].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32H[7].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32L[045].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32W[BL].*:CRC:.*", ("crc", "v3", "CRC")), + (".*:CRC:integtest1_v1_0", ("crc", "v1", "CRC")), // Fall back on the 'integtest' naming (".*:CRC:integtest1_v2_0", ("crc", "v2", "CRC")), (".*:CRC:integtest1_v2_2", ("crc", "v3", "CRC")), (".*:LCD:lcdc1_v1.0.*", ("lcd", "v1", "LCD")), From 136f53de04e6e34911dac3b16cda32d604f614dc Mon Sep 17 00:00:00 2001 From: Taylor Carpenter Date: Sun, 28 Jan 2024 20:11:54 -0500 Subject: [PATCH 2/2] Match all versions of CRC by chip family --- stm32-data-gen/src/chips.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/stm32-data-gen/src/chips.rs b/stm32-data-gen/src/chips.rs index 3b1828e..5c7a45e 100644 --- a/stm32-data-gen/src/chips.rs +++ b/stm32-data-gen/src/chips.rs @@ -476,12 +476,11 @@ impl PeriMatcher { ("STM32F0.*:CRC:.*", ("crc", "v2", "CRC")), ("STM32F[37].*:CRC:.*", ("crc", "v3", "CRC")), ("STM32G[04].*:CRC:.*", ("crc", "v3", "CRC")), - ("STM32H[7].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32H[57].*:CRC:.*", ("crc", "v3", "CRC")), ("STM32L[045].*:CRC:.*", ("crc", "v3", "CRC")), ("STM32W[BL].*:CRC:.*", ("crc", "v3", "CRC")), - (".*:CRC:integtest1_v1_0", ("crc", "v1", "CRC")), // Fall back on the 'integtest' naming - (".*:CRC:integtest1_v2_0", ("crc", "v2", "CRC")), - (".*:CRC:integtest1_v2_2", ("crc", "v3", "CRC")), + ("STM32C[0].*:CRC:.*", ("crc", "v3", "CRC")), + ("STM32U[5].*:CRC:.*", ("crc", "v3", "CRC")), (".*:LCD:lcdc1_v1.0.*", ("lcd", "v1", "LCD")), (".*:LCD:lcdc1_v1.2.*", ("lcd", "v2", "LCD")), (".*:LCD:lcdc1_v1.3.*", ("lcd", "v2", "LCD")),