| Message ID | 20210811131256.323624-1-marcel@ziswiler.com |
|---|---|
| State | Accepted |
| Commit | 5e39e20a1af916fee3aabd61eedafadf29a9edb9 |
| Delegated to: | Tom Warren |
| Headers | show |
| Series | [v3] board: apalis-tk1: launch toradex easy installer in usb recovery | expand |
Hallo Marcel, On 11.08.21 15:12, Marcel Ziswiler wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > The USB recovery mode is used by Toradex to load the Toradex Easy > Installer image which supports further system images installation. > Prepare for loading and launching the Toradex Easy Installer if the > USB Recovery mode is activated. > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > > --- > Added Tom in CC as he's in charge for Tegra (I have just reviewed V2 because it was part of i.MX series). Best regards, Stefano > Changes in v3: > - Switch very long lines to multiline to make checkpatch happy as > suggested by Stefano. > > board/toradex/apalis-tk1/apalis-tk1.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > > diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c > index b97617cfca3..2769b546010 100644 > --- a/board/toradex/apalis-tk1/apalis-tk1.c > +++ b/board/toradex/apalis-tk1/apalis-tk1.c > @@ -38,8 +38,24 @@ > int arch_misc_init(void) > { > if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) == > - NVBOOTTYPE_RECOVERY) > - printf("USB recovery mode\n"); > + NVBOOTTYPE_RECOVERY) { > + printf("USB recovery mode, attempting to boot Toradex Easy " > + "Installer\n"); > + env_set("bootdelay", "-2"); > + env_set("defargs", "pcie_aspm=off user_debug=30"); > + env_set("fdt_high", ""); > + env_set("initrd_high", ""); > + > + env_set("setup", "env set setupargs igb_mac=${ethaddr} " > + "consoleblank=0 no_console_suspend=1 " > + "console=${console},${baudrate}n8 ${memargs}"); > + env_set("teziargs", "rootfstype=squashfs root=/dev/ram quiet " > + "autoinstall"); > + env_set("vidargs", "video=HDMI-A-1:640x480-16@60D"); > + env_set("bootcmd", "run setup; env set bootargs ${defargs} " > + "${setupargs} ${vidargs} ${teziargs}; bootm 0x80208000" > + "#config@${soc}-${fdt_module}-${fdt_board}.dtb"); > + } > > /* PCB Version Indication: V1.2 and later have GPIO_PV0 wired to GND */ > gpio_request(TEGRA_GPIO(V, 0), "PCB Version Indication"); >
On Wed, 2021-08-11 at 16:45 +0000, Tom Warren wrote: > I'm fine with someone else taking this tegra patch in if it's part of a larger series. If not, let me know > and I'll take it as a singleton. The rest of that series which was i.MX specific was already applied by Stefano. So if you could take this one as a singleton that would be great. Thanks! > Tom Cheers Marcel > -- > nvpublic > > -----Original Message----- > From: Stefano Babic <sbabic@denx.de> > Sent: Wednesday, August 11, 2021 6:24 AM > To: Marcel Ziswiler <marcel@ziswiler.com>; u-boot@lists.denx.de > Cc: Stefano Babic <sbabic@denx.de>; Simon Glass <sjg@chromium.org>; Marcel Ziswiler > <marcel.ziswiler@toradex.com>; Oleksandr Suvorov <oleksandr.suvorov@toradex.com>; Tom Warren > <TWarren@nvidia.com> > Subject: Re: [PATCH v3] board: apalis-tk1: launch toradex easy installer in usb recovery > > External email: Use caution opening links or attachments > > > Hallo Marcel, > > On 11.08.21 15:12, Marcel Ziswiler wrote: > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > > The USB recovery mode is used by Toradex to load the Toradex Easy > > Installer image which supports further system images installation. > > Prepare for loading and launching the Toradex Easy Installer if the > > USB Recovery mode is activated. > > > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> > > > > --- > > > > Added Tom in CC as he's in charge for Tegra (I have just reviewed V2 because it was part of i.MX series). > > Best regards, > Stefano > > > Changes in v3: > > - Switch very long lines to multiline to make checkpatch happy as > > suggested by Stefano. > > > > board/toradex/apalis-tk1/apalis-tk1.c | 20 ++++++++++++++++++-- > > 1 file changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/board/toradex/apalis-tk1/apalis-tk1.c > > b/board/toradex/apalis-tk1/apalis-tk1.c > > index b97617cfca3..2769b546010 100644 > > --- a/board/toradex/apalis-tk1/apalis-tk1.c > > +++ b/board/toradex/apalis-tk1/apalis-tk1.c > > @@ -38,8 +38,24 @@ > > int arch_misc_init(void) > > { > > if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) == > > - NVBOOTTYPE_RECOVERY) > > - printf("USB recovery mode\n"); > > + NVBOOTTYPE_RECOVERY) { > > + printf("USB recovery mode, attempting to boot Toradex Easy " > > + "Installer\n"); > > + env_set("bootdelay", "-2"); > > + env_set("defargs", "pcie_aspm=off user_debug=30"); > > + env_set("fdt_high", ""); > > + env_set("initrd_high", ""); > > + > > + env_set("setup", "env set setupargs igb_mac=${ethaddr} " > > + "consoleblank=0 no_console_suspend=1 " > > + "console=${console},${baudrate}n8 ${memargs}"); > > + env_set("teziargs", "rootfstype=squashfs root=/dev/ram quiet " > > + "autoinstall"); > > + env_set("vidargs", "video=HDMI-A-1:640x480-16@60D"); > > + env_set("bootcmd", "run setup; env set bootargs ${defargs} " > > + "${setupargs} ${vidargs} ${teziargs}; bootm 0x80208000" > > + "#config@${soc}-${fdt_module}-${fdt_board}.dtb"); > > + } > > > > /* PCB Version Indication: V1.2 and later have GPIO_PV0 wired to GND */ > > gpio_request(TEGRA_GPIO(V, 0), "PCB Version Indication");
diff --git a/board/toradex/apalis-tk1/apalis-tk1.c b/board/toradex/apalis-tk1/apalis-tk1.c index b97617cfca3..2769b546010 100644 --- a/board/toradex/apalis-tk1/apalis-tk1.c +++ b/board/toradex/apalis-tk1/apalis-tk1.c @@ -38,8 +38,24 @@ int arch_misc_init(void) { if (readl(NV_PA_BASE_SRAM + NVBOOTINFOTABLE_BOOTTYPE) == - NVBOOTTYPE_RECOVERY) - printf("USB recovery mode\n"); + NVBOOTTYPE_RECOVERY) { + printf("USB recovery mode, attempting to boot Toradex Easy " + "Installer\n"); + env_set("bootdelay", "-2"); + env_set("defargs", "pcie_aspm=off user_debug=30"); + env_set("fdt_high", ""); + env_set("initrd_high", ""); + + env_set("setup", "env set setupargs igb_mac=${ethaddr} " + "consoleblank=0 no_console_suspend=1 " + "console=${console},${baudrate}n8 ${memargs}"); + env_set("teziargs", "rootfstype=squashfs root=/dev/ram quiet " + "autoinstall"); + env_set("vidargs", "video=HDMI-A-1:640x480-16@60D"); + env_set("bootcmd", "run setup; env set bootargs ${defargs} " + "${setupargs} ${vidargs} ${teziargs}; bootm 0x80208000" + "#config@${soc}-${fdt_module}-${fdt_board}.dtb"); + } /* PCB Version Indication: V1.2 and later have GPIO_PV0 wired to GND */ gpio_request(TEGRA_GPIO(V, 0), "PCB Version Indication");