diff options
| author | Tom Rini <trini@konsulko.com> | 2022-04-22 08:12:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-22 08:12:20 -0400 |
| commit | 6e2af641e4bfed24d3edd8519dd40ec397361b4e (patch) | |
| tree | d387bc01229acd9db9d344f9c8240ce3b852f6fc /arch/arm/mach-imx/cmd_mfgprot.c | |
| parent | ea5583b90f9c162af6f2025718dc50ffbb6e4552 (diff) | |
| parent | d173b107be94eb474e1ae75a8addbf5f2fecfd56 (diff) | |
Merge tag 'u-boot-imx-20220422' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20220422
-------------------
- Switch to DM_SERIAL
- Drop MMCROOT
- several cleanup
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/11815
Diffstat (limited to 'arch/arm/mach-imx/cmd_mfgprot.c')
| -rw-r--r-- | arch/arm/mach-imx/cmd_mfgprot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index aed3b2f83da..ec8a8756f7f 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -12,13 +12,11 @@ #include <linux/compiler.h> #include <command.h> #include <common.h> -#include <environment.h> +#include <env.h> #include <fsl_sec.h> #include <mapmem.h> #include <memalign.h> -DECLARE_GLOBAL_DATA_PTR; - /** * do_mfgprot() - Handle the "mfgprot" command-line command * @cmdtp: Command data struct pointer |