Skip to content

Commit d86b251

Browse files
thenguyenyfKhiemNguyenT
authored andcommitted
hal: renesas: ra: add ofs setting for WDT
Reflect OFS setting for WDT from Zephyr Kconfig value Signed-off-by: The Nguyen <[email protected]>
1 parent 206ef38 commit d86b251

18 files changed

+144
-18
lines changed

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2a1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,16 @@
3131
#define BSP_VECTOR_TABLE_MAX_ENTRIES (48U)
3232
#define BSP_CFG_INLINE_IRQ_FUNCTIONS (0)
3333

34+
/* OFS0 WDT configurations */
35+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
36+
#define WDTSTRT (0)
37+
#else
38+
#define WDTSTRT (1)
39+
#endif
40+
3441
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
3542
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
36-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
43+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
3744
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
3845
#define OFS_SEQ5 (1 << 28) | (1 << 30)
3946
#define BSP_CFG_USE_LOW_VOLTAGE_MODE ((0))

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2l1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,16 @@
3030
#define BSP_VECTOR_TABLE_MAX_ENTRIES (48U)
3131
#define BSP_CFG_INLINE_IRQ_FUNCTIONS (0)
3232

33+
/* OFS0 WDT configurations */
34+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
35+
#define WDTSTRT (0)
36+
#else
37+
#define WDTSTRT (1)
38+
#endif
39+
3340
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
3441
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
35-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
42+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
3643
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
3744
#define OFS_SEQ5 (1 << 28) | (1 << 30)
3845
#define BSP_CFG_USE_LOW_VOLTAGE_MODE (0)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,16 @@
294294
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
295295
#endif
296296

297+
/* OFS0 WDT configurations */
298+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
299+
#define WDTSTRT (0)
300+
#else
301+
#define WDTSTRT (1)
302+
#endif
303+
297304
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
298305
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
299-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
306+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
300307
#define OFS_SEQ4 (3 << 18) |(15 << 20) | (3 << 24) | (3 << 26)
301308
#define OFS_SEQ5 (1 << 28) | (1 << 30)
302309
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e2/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,16 @@
285285
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
286286
#endif
287287

288+
/* OFS0 WDT configurations */
289+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
290+
#define WDTSTRT (0)
291+
#else
292+
#define WDTSTRT (1)
293+
#endif
294+
288295
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
289296
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
290-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
297+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
291298
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
292299
#define OFS_SEQ5 (1 << 28) | (1 << 30)
293300
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4l1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,16 @@ extern "C" {
287287
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
288288
#endif
289289

290+
/* OFS0 WDT configurations */
291+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
292+
#define WDTSTRT (0)
293+
#else
294+
#define WDTSTRT (1)
295+
#endif
296+
290297
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
291298
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
292-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
299+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
293300
#define OFS_SEQ4 (3 << 18) |(15 << 20) | (3 << 24) | (3 << 26)
294301
#define OFS_SEQ5 (1 << 28) | (1 << 30)
295302
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m2/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,16 @@
306306
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
307307
#endif
308308

309+
/* OFS0 WDT configurations */
310+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
311+
#define WDTSTRT (0)
312+
#else
313+
#define WDTSTRT (1)
314+
#endif
315+
309316
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
310317
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
311-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
318+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
312319
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
313320
#define OFS_SEQ5 (1 << 28) | (1 << 30)
314321
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m3/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,16 @@
307307
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
308308
#endif
309309

310+
/* OFS0 WDT configurations */
311+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
312+
#define WDTSTRT (0)
313+
#else
314+
#define WDTSTRT (1)
315+
#endif
316+
310317
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
311318
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
312-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
319+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
313320
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
314321
#define OFS_SEQ5 (1 << 28) | (1 << 30)
315322
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4w1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,16 @@
3131
#define BSP_VECTOR_TABLE_MAX_ENTRIES (48U)
3232
#define BSP_CFG_INLINE_IRQ_FUNCTIONS (1)
3333

34+
/* OFS0 WDT configurations */
35+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
36+
#define WDTSTRT (0)
37+
#else
38+
#define WDTSTRT (1)
39+
#endif
40+
3441
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
3542
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
36-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
43+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
3744
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
3845
#define OFS_SEQ5 (1 << 28) | (1 << 30)
3946
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e1/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,16 @@
293293
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
294294
#endif
295295

296+
/* OFS0 WDT configurations */
297+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
298+
#define WDTSTRT (0)
299+
#else
300+
#define WDTSTRT (1)
301+
#endif
302+
296303
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
297304
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
298-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
305+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
299306
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
300307
#define OFS_SEQ5 (1 << 28) | (1 << 30)
301308
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e2/bsp_mcu_family_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,16 @@
275275
#define BSP_TZ_CFG_NON_SECURE_APPLICATION_FALLBACK (1U)
276276
#endif
277277

278+
/* OFS0 WDT configurations */
279+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
280+
#define WDTSTRT (0)
281+
#else
282+
#define WDTSTRT (1)
283+
#endif
284+
278285
#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
279286
#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
280-
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
287+
#define OFS_SEQ3 (1 << 12) | (1 << 14) | (WDTSTRT << 17)
281288
#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
282289
#define OFS_SEQ5 (1 << 28) | (1 << 30)
283290
#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)

0 commit comments

Comments
 (0)