diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-28 07:44:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-28 07:44:03 -0500 |
| commit | ab865a8ee5c1a069f72a171270c02c99ccda7bfa (patch) | |
| tree | b4ac4a8519bc0128f12de2a13a8311c0f845f5b5 /arch/arm/mach-imx/imx8/ahab.c | |
| parent | 1c3d1aa00617dbbdd92f0d5a2df40d7784dfcc13 (diff) | |
| parent | 26c7048dd9d04158a23e9dbfe3f0dccc4febcaed (diff) | |
Merge tag 'u-boot-imx-20201227' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2021.1
----------------
CI: https://gitlab.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/5680
- fixes for Variscite dart6ul
- imx8mp : increase malloc area
- fixes for bx50v3
- imx8m: HS400ES and UHS for EVK
- imx8qm-rom7720: fix phy bind
Diffstat (limited to 'arch/arm/mach-imx/imx8/ahab.c')
| -rw-r--r-- | arch/arm/mach-imx/imx8/ahab.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index 4bb7c46921..600a1108ce 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -303,10 +303,11 @@ static int confirm_close(void) static int do_ahab_close(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + int confirmed = argc >= 2 && !strcmp(argv[1], "-y"); int err; u16 lc; - if (!confirm_close()) + if (!confirmed && !confirm_close()) return -EACCES; err = sc_seco_chip_info(-1, &lc, NULL, NULL, NULL); |