Skip to content

Commit f0b2519

Browse files
djiatsaf-sterwango
djiatsaf-st
authored and
erwango
committed
stm32cube: stm32h7rsxx: soc: update h7 soc files
sync soc files with the correct h7rs cube repository history. Signed-off-by: Fabrice DJIATSA <[email protected]>
1 parent c17bcab commit f0b2519

File tree

4 files changed

+4
-28
lines changed

4 files changed

+4
-28
lines changed

‎stm32cube/stm32h7rsxx/soc/stm32h7r3xx.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2108,7 +2108,6 @@ typedef struct
21082108
#define FMC_Bank3_R_BASE (FMC_R_BASE + 0x0080UL)
21092109
#define FMC_Bank5_6_R_BASE (FMC_R_BASE + 0x0140UL)
21102110
#define XSPI1_R_BASE (AHB5PERIPH_BASE + 0x5000UL)
2111-
#define DLYB_XSPI1_BASE (AHB5PERIPH_BASE + 0x6000UL)
21122111
#define SDMMC1_BASE (AHB5PERIPH_BASE + 0x7000UL)
21132112
#define DLYB_SDMMC1_BASE (AHB5PERIPH_BASE + 0x8000UL)
21142113
#define RAMECC1_BASE (AHB5PERIPH_BASE + 0x9000UL)
@@ -2118,7 +2117,6 @@ typedef struct
21182117
#define RAMECC1_Monitor3_BASE (RAMECC1_BASE + 0x80UL)
21192118
#define RAMECC1_Monitor4_BASE (RAMECC1_BASE + 0xA0UL)
21202119
#define XSPI2_R_BASE (AHB5PERIPH_BASE + 0xA000UL)
2121-
#define DLYB_XSPI2_BASE (AHB5PERIPH_BASE + 0xB000UL)
21222120
#define XSPIM_BASE (AHB5PERIPH_BASE + 0xB400UL)
21232121
#define GFXMMU_BASE (AHB5PERIPH_BASE + 0x010000UL)
21242122

@@ -2379,8 +2377,6 @@ typedef struct
23792377
#define DCMIPP ((DCMIPP_TypeDef *) DCMIPP_BASE)
23802378
#define DLYB_SDMMC1 ((DLYB_TypeDef *) DLYB_SDMMC1_BASE)
23812379
#define DLYB_SDMMC2 ((DLYB_TypeDef *) DLYB_SDMMC2_BASE)
2382-
#define DLYB_XSPI1 ((DLYB_TypeDef *) DLYB_XSPI1_BASE)
2383-
#define DLYB_XSPI2 ((DLYB_TypeDef *) DLYB_XSPI2_BASE)
23842380
#define DMA2D ((DMA2D_TypeDef *) DMA2D_BASE)
23852381
#define DTS ((DTS_TypeDef *) DTS_BASE)
23862382
#define ETH ((ETH_TypeDef *)ETH_BASE)
@@ -22634,9 +22630,7 @@ typedef struct
2263422630
#define IS_DCMIPP_ALL_INSTANCE(INSTANCE) ((INSTANCE) == DCMIPP)
2263522631

2263622632
/******************************* DLYB Instances *******************************/
22637-
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_XSPI1) || \
22638-
((INSTANCE) == DLYB_XSPI2) || \
22639-
((INSTANCE) == DLYB_SDMMC1) || \
22633+
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_SDMMC1) || \
2264022634
((INSTANCE) == DLYB_SDMMC2))
2264122635

2264222636
/******************************** DMA Instances *******************************/

‎stm32cube/stm32h7rsxx/soc/stm32h7r7xx.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,7 +2178,6 @@ typedef struct
21782178
#define FMC_Bank3_R_BASE (FMC_R_BASE + 0x0080UL)
21792179
#define FMC_Bank5_6_R_BASE (FMC_R_BASE + 0x0140UL)
21802180
#define XSPI1_R_BASE (AHB5PERIPH_BASE + 0x5000UL)
2181-
#define DLYB_XSPI1_BASE (AHB5PERIPH_BASE + 0x6000UL)
21822181
#define SDMMC1_BASE (AHB5PERIPH_BASE + 0x7000UL)
21832182
#define DLYB_SDMMC1_BASE (AHB5PERIPH_BASE + 0x8000UL)
21842183
#define RAMECC1_BASE (AHB5PERIPH_BASE + 0x9000UL)
@@ -2188,7 +2187,6 @@ typedef struct
21882187
#define RAMECC1_Monitor3_BASE (RAMECC1_BASE + 0x80UL)
21892188
#define RAMECC1_Monitor4_BASE (RAMECC1_BASE + 0xA0UL)
21902189
#define XSPI2_R_BASE (AHB5PERIPH_BASE + 0xA000UL)
2191-
#define DLYB_XSPI2_BASE (AHB5PERIPH_BASE + 0xB000UL)
21922190
#define XSPIM_BASE (AHB5PERIPH_BASE + 0xB400UL)
21932191
#define GFXMMU_BASE (AHB5PERIPH_BASE + 0x010000UL)
21942192
#define GPU2D_BASE (AHB5PERIPH_BASE + 0x014000UL)
@@ -2451,8 +2449,6 @@ typedef struct
24512449
#define DCMIPP ((DCMIPP_TypeDef *) DCMIPP_BASE)
24522450
#define DLYB_SDMMC1 ((DLYB_TypeDef *) DLYB_SDMMC1_BASE)
24532451
#define DLYB_SDMMC2 ((DLYB_TypeDef *) DLYB_SDMMC2_BASE)
2454-
#define DLYB_XSPI1 ((DLYB_TypeDef *) DLYB_XSPI1_BASE)
2455-
#define DLYB_XSPI2 ((DLYB_TypeDef *) DLYB_XSPI2_BASE)
24562452
#define DMA2D ((DMA2D_TypeDef *) DMA2D_BASE)
24572453
#define DTS ((DTS_TypeDef *) DTS_BASE)
24582454
#define ETH ((ETH_TypeDef *)ETH_BASE)
@@ -23064,9 +23060,7 @@ typedef struct
2306423060
#define IS_DCMIPP_ALL_INSTANCE(INSTANCE) ((INSTANCE) == DCMIPP)
2306523061

2306623062
/******************************* DLYB Instances *******************************/
23067-
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_XSPI1) || \
23068-
((INSTANCE) == DLYB_XSPI2) || \
23069-
((INSTANCE) == DLYB_SDMMC1) || \
23063+
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_SDMMC1) || \
2307023064
((INSTANCE) == DLYB_SDMMC2))
2307123065

2307223066
/******************************** DMA Instances *******************************/

‎stm32cube/stm32h7rsxx/soc/stm32h7s3xx.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,7 +2238,6 @@ typedef struct
22382238
#define FMC_Bank3_R_BASE (FMC_R_BASE + 0x0080UL)
22392239
#define FMC_Bank5_6_R_BASE (FMC_R_BASE + 0x0140UL)
22402240
#define XSPI1_R_BASE (AHB5PERIPH_BASE + 0x5000UL)
2241-
#define DLYB_XSPI1_BASE (AHB5PERIPH_BASE + 0x6000UL)
22422241
#define SDMMC1_BASE (AHB5PERIPH_BASE + 0x7000UL)
22432242
#define DLYB_SDMMC1_BASE (AHB5PERIPH_BASE + 0x8000UL)
22442243
#define RAMECC1_BASE (AHB5PERIPH_BASE + 0x9000UL)
@@ -2248,7 +2247,6 @@ typedef struct
22482247
#define RAMECC1_Monitor3_BASE (RAMECC1_BASE + 0x80UL)
22492248
#define RAMECC1_Monitor4_BASE (RAMECC1_BASE + 0xA0UL)
22502249
#define XSPI2_R_BASE (AHB5PERIPH_BASE + 0xA000UL)
2251-
#define DLYB_XSPI2_BASE (AHB5PERIPH_BASE + 0xB000UL)
22522250
#define XSPIM_BASE (AHB5PERIPH_BASE + 0xB400UL)
22532251
#define MCE1_BASE (AHB5PERIPH_BASE + 0xB800UL)
22542252
#define MCE1_REGION1_BASE (MCE1_BASE + 0x040UL)
@@ -2527,8 +2525,6 @@ typedef struct
25272525
#define DCMIPP ((DCMIPP_TypeDef *) DCMIPP_BASE)
25282526
#define DLYB_SDMMC1 ((DLYB_TypeDef *) DLYB_SDMMC1_BASE)
25292527
#define DLYB_SDMMC2 ((DLYB_TypeDef *) DLYB_SDMMC2_BASE)
2530-
#define DLYB_XSPI1 ((DLYB_TypeDef *) DLYB_XSPI1_BASE)
2531-
#define DLYB_XSPI2 ((DLYB_TypeDef *) DLYB_XSPI2_BASE)
25322528
#define DMA2D ((DMA2D_TypeDef *) DMA2D_BASE)
25332529
#define DTS ((DTS_TypeDef *) DTS_BASE)
25342530
#define ETH ((ETH_TypeDef *)ETH_BASE)
@@ -23517,9 +23513,7 @@ typedef struct
2351723513
#define IS_DCMIPP_ALL_INSTANCE(INSTANCE) ((INSTANCE) == DCMIPP)
2351823514

2351923515
/******************************* DLYB Instances *******************************/
23520-
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_XSPI1) || \
23521-
((INSTANCE) == DLYB_XSPI2) || \
23522-
((INSTANCE) == DLYB_SDMMC1) || \
23516+
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_SDMMC1) || \
2352323517
((INSTANCE) == DLYB_SDMMC2))
2352423518

2352523519
/******************************** DMA Instances *******************************/

‎stm32cube/stm32h7rsxx/soc/stm32h7s7xx.h‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,7 +2308,6 @@ typedef struct
23082308
#define FMC_Bank3_R_BASE (FMC_R_BASE + 0x0080UL)
23092309
#define FMC_Bank5_6_R_BASE (FMC_R_BASE + 0x0140UL)
23102310
#define XSPI1_R_BASE (AHB5PERIPH_BASE + 0x5000UL)
2311-
#define DLYB_XSPI1_BASE (AHB5PERIPH_BASE + 0x6000UL)
23122311
#define SDMMC1_BASE (AHB5PERIPH_BASE + 0x7000UL)
23132312
#define DLYB_SDMMC1_BASE (AHB5PERIPH_BASE + 0x8000UL)
23142313
#define RAMECC1_BASE (AHB5PERIPH_BASE + 0x9000UL)
@@ -2318,7 +2317,6 @@ typedef struct
23182317
#define RAMECC1_Monitor3_BASE (RAMECC1_BASE + 0x80UL)
23192318
#define RAMECC1_Monitor4_BASE (RAMECC1_BASE + 0xA0UL)
23202319
#define XSPI2_R_BASE (AHB5PERIPH_BASE + 0xA000UL)
2321-
#define DLYB_XSPI2_BASE (AHB5PERIPH_BASE + 0xB000UL)
23222320
#define XSPIM_BASE (AHB5PERIPH_BASE + 0xB400UL)
23232321
#define MCE1_BASE (AHB5PERIPH_BASE + 0xB800UL)
23242322
#define MCE1_REGION1_BASE (MCE1_BASE + 0x040UL)
@@ -2599,8 +2597,6 @@ typedef struct
25992597
#define DCMIPP ((DCMIPP_TypeDef *) DCMIPP_BASE)
26002598
#define DLYB_SDMMC1 ((DLYB_TypeDef *) DLYB_SDMMC1_BASE)
26012599
#define DLYB_SDMMC2 ((DLYB_TypeDef *) DLYB_SDMMC2_BASE)
2602-
#define DLYB_XSPI1 ((DLYB_TypeDef *) DLYB_XSPI1_BASE)
2603-
#define DLYB_XSPI2 ((DLYB_TypeDef *) DLYB_XSPI2_BASE)
26042600
#define DMA2D ((DMA2D_TypeDef *) DMA2D_BASE)
26052601
#define DTS ((DTS_TypeDef *) DTS_BASE)
26062602
#define ETH ((ETH_TypeDef *)ETH_BASE)
@@ -23947,9 +23943,7 @@ typedef struct
2394723943
#define IS_DCMIPP_ALL_INSTANCE(INSTANCE) ((INSTANCE) == DCMIPP)
2394823944

2394923945
/******************************* DLYB Instances *******************************/
23950-
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_XSPI1) || \
23951-
((INSTANCE) == DLYB_XSPI2) || \
23952-
((INSTANCE) == DLYB_SDMMC1) || \
23946+
#define IS_DLYB_ALL_INSTANCE(INSTANCE) (((INSTANCE) == DLYB_SDMMC1) || \
2395323947
((INSTANCE) == DLYB_SDMMC2))
2395423948

2395523949
/******************************** DMA Instances *******************************/

0 commit comments

Comments
 (0)