| Message ID | 20180417005940.12189-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Commit | a3c159b9c3cb844a8f0bb3abdac93b0fcaccba54 |
| Delegated to: | Marek Vasut |
| Headers | show |
| Series | [U-Boot,1/2] ARM: rmobile: Ignore U-Boot env when started via JTAG on Stout | expand |
diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d7e81292a0..192ee66a38 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -128,3 +128,18 @@ int board_phy_config(struct phy_device *phydev) const struct rmobile_sysinfo sysinfo = { CONFIG_ARCH_RMOBILE_BOARD_STRING }; + +enum env_location env_get_location(enum env_operation op, int prio) +{ + const u32 load_magic = 0xb33fc0de; + + /* Block environment access if loaded using JTAG */ + if ((readl(CONFIG_SPL_TEXT_BASE + 0x24) == load_magic) && + (op != ENVOP_INIT)) + return ENVL_UNKNOWN; + + if (prio) + return ENVL_UNKNOWN; + + return ENVL_SPI_FLASH; +}
When U-Boot is started via JTAG, ignore the installed environment as it may interfere with the recovery of the board. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- board/renesas/stout/stout.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)