| Message ID | 20220825065404.161821-5-bernhard.messerklinger@br-automation.com |
|---|---|
| State | Accepted |
| Commit | 0daeadbbd2513a9f79dae113aa47e1a71e5d9153 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Fix, update and cleanup brppt1 board | expand |
From: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> Sent: Thursday, August 25, 2022 8:54 Subject: [PATCH 4/5] include: configs: brppt1: Fix commit 0ea4fc4dcf90 > Commit 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") > destroys the boot targets b_t30lgcy#0 and b_t30lgcy#1. The reason behind > this is, that b_t30lgcy#0 and b_t30lgcy#1 both load the for booting > needed device trees from mmc and the cfgscr script patches those. Because > of this, cfgscr is not allowed to destroy the previously loaded device > tree otherwise cfgscr will fail. > This patch moves the device trees invalidation on warm restart to the > PREBOOT cmd to fix that issue. > > Fixes: 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") > Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> > --- > > configs/brppt1_mmc_defconfig | 2 +- > include/configs/brppt1.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
On Thu, Aug 25, 2022 at 08:54:03AM +0200, Bernhard Messerklinger wrote: > Commit 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") > destroys the boot targets b_t30lgcy#0 and b_t30lgcy#1. The reason behind > this is, that b_t30lgcy#0 and b_t30lgcy#1 both load the for booting > needed device trees from mmc and the cfgscr script patches those. Because > of this, cfgscr is not allowed to destroy the previously loaded device > tree otherwise cfgscr will fail. > This patch moves the device trees invalidation on warm restart to the > PREBOOT cmd to fix that issue. > > Fixes: 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") > Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> > Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com> Applied to u-boot/next, thanks!
diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index 716650aac9..6da6d58bfd 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -26,7 +26,7 @@ CONFIG_BOOTDELAY=0 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run b_default" CONFIG_USE_PREBOOT=y -CONFIG_PREBOOT="run cfgscr; run brdefaultip" +CONFIG_PREBOOT="mw ${dtbaddr} 0; run cfgscr; run brdefaultip" CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 481473ae2c..aaf3f8b4a5 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -53,7 +53,6 @@ #ifdef CONFIG_ENV_IS_IN_MMC #define MMCTGTS \ MMC_TGTS \ -"cfgscr=mw ${dtbaddr} 0;" \ " mmc dev 1; mmc read ${cfgaddr} 200 80; source ${cfgaddr};" \ " fdt addr ${dtbaddr} || cp ${fdtcontroladdr} ${dtbaddr} 4000\0" #else
Commit 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") destroys the boot targets b_t30lgcy#0 and b_t30lgcy#1. The reason behind this is, that b_t30lgcy#0 and b_t30lgcy#1 both load the for booting needed device trees from mmc and the cfgscr script patches those. Because of this, cfgscr is not allowed to destroy the previously loaded device tree otherwise cfgscr will fail. This patch moves the device trees invalidation on warm restart to the PREBOOT cmd to fix that issue. Fixes: 0ea4fc4dcf90 ("board/BuR: invalidate ${dtbaddr} before cfgscr") Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com> --- configs/brppt1_mmc_defconfig | 2 +- include/configs/brppt1.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)