aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng2018-10-24 08:36:39 -0500
committerSimon Glass2018-11-14 11:16:28 -0600
commit8ee27da343aac7ba88b1efab620fc5ef30325ded (patch)
tree2f728102fa7fb1d296c85fa0bcf33aa46b133aa3
parente3245e4254e1e5caae24b33e203810db7307edfb (diff)
downloadu-boot-8ee27da343aac7ba88b1efab620fc5ef30325ded.tar.gz
u-boot-8ee27da343aac7ba88b1efab620fc5ef30325ded.tar.xz
u-boot-8ee27da343aac7ba88b1efab620fc5ef30325ded.zip
watchdog: Remove DM_FLAG_PRE_RELOC flag in various drivers
When a driver declares DM_FLAG_PRE_RELOC flag, it wishes to be bound before relocation. However due to a bug in the DM core, the flag only takes effect when devices are statically declared via U_BOOT_DEVICE(). This bug has been fixed recently by commit "dm: core: Respect drivers with the DM_FLAG_PRE_RELOC flag in lists_bind_fdt()", but with the fix, it has a side effect that all existing drivers that declared DM_FLAG_PRE_RELOC flag will be bound before relocation now. This may expose potential boot failure on some boards due to insufficient memory during the pre-relocation stage. To mitigate this potential impact, the following changes are implemented: - Remove DM_FLAG_PRE_RELOC flag in the driver, if the driver only supports configuration from device tree (OF_CONTROL) - Keep DM_FLAG_PRE_RELOC flag in the driver only if the device is statically declared via U_BOOT_DEVICE() - Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check, for drivers that support both statically declared devices and configuration from device tree Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/watchdog/ast_wdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index 59afa21efa..523484b1ff 100644
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -119,5 +119,4 @@ U_BOOT_DRIVER(ast_wdt) = {
119 .priv_auto_alloc_size = sizeof(struct ast_wdt_priv), 119 .priv_auto_alloc_size = sizeof(struct ast_wdt_priv),
120 .ofdata_to_platdata = ast_wdt_ofdata_to_platdata, 120 .ofdata_to_platdata = ast_wdt_ofdata_to_platdata,
121 .ops = &ast_wdt_ops, 121 .ops = &ast_wdt_ops,
122 .flags = DM_FLAG_PRE_RELOC,
123}; 122};