Skip to content

Commit bf7fc9f

Browse files
Josua-SRlizthegrey
authored andcommitted
plat: lx2160a: fix building without NXP_NV_SW_MAINT_LAST_EXEC_DATA
Fix compiler errors encountered when disabling non-volatile storage of execution state (NXP_NV_SW_MAINT_LAST_EXEC_DATA := no) while keeping watchdog restart enabled (NXP_WDOG_RESTART := yes). Signed-off-by: Josua Mayer <josua@solid-run.com>
1 parent fc1a3ce commit bf7fc9f

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

  • drivers/nxp/ddr/phy-gen2
  • plat/nxp/soc-lx2160a

drivers/nxp/ddr/phy-gen2/phy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#if !defined(PHY_H) && defined(NXP_WARM_BOOT)
77
#define PHY_H
88

9-
#include <flash_info.h>
9+
#include <drivers/nxp/flexspi/flash_info.h>
1010

1111
/* To store sector size to be erase on flash*/
1212
#define PHY_ERASE_SIZE F_SECTOR_ERASE_SZ

plat/nxp/soc-lx2160a/soc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,12 @@ void soc_init(void)
524524
static uint64_t wdog_interrupt_handler(uint32_t id, uint32_t flags,
525525
void *handle, void *cookie)
526526
{
527+
#ifdef NXP_NV_SW_MAINT_LAST_EXEC_DATA
527528
uint8_t data = WDOG_RESET_FLAG;
528529

529530
wr_nv_app_data(WDT_RESET_FLAG_OFFSET,
530531
(uint8_t *)&data, sizeof(data));
532+
#endif
531533

532534
mmio_write_32(NXP_RST_ADDR + RSTCNTL_OFFSET, SW_RST_REQ_INIT);
533535

0 commit comments

Comments
 (0)