diff options
author | Tom Rini <trini@konsulko.com> | 2024-10-05 11:18:16 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-10-05 11:18:16 -0600 |
commit | 7321b7dd36b3722fdbe2c661c8c478c429cd5267 (patch) | |
tree | 14eb3498aed79b317c97f5c19fc12102765b4246 /arch/arm/mach-imx/cmd_mfgprot.c | |
parent | be99d3cba64afda8b963b98682fa6e158e713c05 (diff) | |
parent | ef815d75514da91dd98f9e3278d810439fd1f1ea (diff) |
Merge tag 'u-boot-imx-next-20241005' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22526
- Add DA9063 watchdog support for the imx6q-lxr2 board.
- Add support for DH electronics i.MX8M Plus DHCOM PicoITX
- Add DH i.MX8MP DHCOM SoM on DRC02 carrier board
- Several fsl_esdhc_imx improvements.
- Pas no-mmc-hs400 to mmc2 on imx8mm-cl-iot-gate.
Diffstat (limited to 'arch/arm/mach-imx/cmd_mfgprot.c')
-rw-r--r-- | arch/arm/mach-imx/cmd_mfgprot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index 9f37e611a1e..8f66de699c5 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -143,6 +143,6 @@ U_BOOT_LONGHELP(mfgprot, U_BOOT_CMD( mfgprot, 4, 1, do_mfgprot, - "Manufacturing Protection\n", + "Manufacturing Protection", mfgprot_help_text ); |