iot2050: Enable watchdog support, but do not auto-start it

This allows to use the watchdog in custom scripts but does not enforce
that the OS has to support it as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Jan Kiszka 2021-09-18 08:17:56 +02:00 committed by Tom Rini
parent f3efb1d106
commit 26fa063c6e
3 changed files with 36 additions and 0 deletions

View file

@ -80,6 +80,19 @@
filename = "arch/arm/dts/k3-am6548-iot2050-advanced-pg2.dtb"; filename = "arch/arm/dts/k3-am6548-iot2050-advanced-pg2.dtb";
}; };
}; };
#ifdef CONFIG_WDT_K3_RTI_FW_FILE
k3-rti-wdt-firmware {
type = "firmware";
load = <0x82000000>;
arch = "arm";
compression = "none";
blob-ext {
filename = CONFIG_WDT_K3_RTI_FW_FILE;
missing-msg = "k3-rti-wdt-firmware";
};
};
#endif
}; };
configurations { configurations {
@ -89,24 +102,36 @@
description = "iot2050-basic"; description = "iot2050-basic";
firmware = "u-boot"; firmware = "u-boot";
fdt = "fdt-iot2050-basic"; fdt = "fdt-iot2050-basic";
#ifdef CONFIG_WDT_K3_RTI_FW_FILE
loadables = "k3-rti-wdt-firmware";
#endif
}; };
conf-iot2050-basic-pg2 { conf-iot2050-basic-pg2 {
description = "iot2050-basic-pg2"; description = "iot2050-basic-pg2";
firmware = "u-boot"; firmware = "u-boot";
fdt = "fdt-iot2050-basic-pg2"; fdt = "fdt-iot2050-basic-pg2";
#ifdef CONFIG_WDT_K3_RTI_FW_FILE
loadables = "k3-rti-wdt-firmware";
#endif
}; };
conf-iot2050-advanced { conf-iot2050-advanced {
description = "iot2050-advanced"; description = "iot2050-advanced";
firmware = "u-boot"; firmware = "u-boot";
fdt = "fdt-iot2050-advanced"; fdt = "fdt-iot2050-advanced";
#ifdef CONFIG_WDT_K3_RTI_FW_FILE
loadables = "k3-rti-wdt-firmware";
#endif
}; };
conf-iot2050-advanced-pg2 { conf-iot2050-advanced-pg2 {
description = "iot2050-advanced-pg2"; description = "iot2050-advanced-pg2";
firmware = "u-boot"; firmware = "u-boot";
fdt = "fdt-iot2050-advanced-pg2"; fdt = "fdt-iot2050-advanced-pg2";
#ifdef CONFIG_WDT_K3_RTI_FW_FILE
loadables = "k3-rti-wdt-firmware";
#endif
}; };
}; };
}; };

View file

@ -50,6 +50,7 @@ CONFIG_CMD_MMC=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
CONFIG_CMD_REMOTEPROC=y CONFIG_CMD_REMOTEPROC=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_CMD_WDT=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TIME=y CONFIG_CMD_TIME=y
# CONFIG_ISO_PARTITION is not set # CONFIG_ISO_PARTITION is not set
@ -127,4 +128,9 @@ CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y CONFIG_USB_KEYBOARD=y
# CONFIG_WATCHDOG is not set
# CONFIG_WATCHDOG_AUTOSTART is not set
CONFIG_WDT=y
CONFIG_WDT_K3_RTI=y
CONFIG_WDT_K3_RTI_LOAD_FW=y
CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_OF_LIBFDT_OVERLAY=y

View file

@ -17,3 +17,8 @@ board/sunxi/README.sunxi64
scp-sunxi: scp-sunxi:
SCP firmware is required for system suspend, but is otherwise optional. SCP firmware is required for system suspend, but is otherwise optional.
Please read the section on SCP firmware in board/sunxi/README.sunxi64 Please read the section on SCP firmware in board/sunxi/README.sunxi64
k3-rti-wdt-firmware:
If CONFIG_WDT_K3_RTI_LOAD_FW is enabled, a firmware image is needed for
the R5F core(s) to trigger the system reset. One possible source is
https://github.com/siemens/k3-rti-wdt.