diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-09 09:54:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-09 09:54:22 -0400 |
| commit | 506d52308a2f5de48c2b9a08229fee9a0ee2842a (patch) | |
| tree | d0d96d1fac8c0912155941f8b684f8654ce27d50 /arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | |
| parent | d9107930af63d88c2d84560db19e65f1a51c4cbd (diff) | |
| parent | db17e40ccab6526a9db6ffdd071182a37dd888eb (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Add two- and three-argument versions of CONFIG_IS_ENABLED in
linux/kconfig.h
- Adds a new feature which supports copying modified parts of
the frame buffer to the uncached hardware buffer
- Enable the copy framebuffer on various x86 targets
Diffstat (limited to 'arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index 0722e4a891d..cbf0120adcb 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -147,7 +147,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, /* Try bootm for legacy and FIT format image */ if (genimg_get_format((void *)uimage) != IMAGE_FORMAT_INVALID) do_bootm(cmdtp, 0, 4, bootm_argv); - else if CONFIG_IS_ENABLED(CMD_BOOTZ) + else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) do_bootz(cmdtp, 0, 4, bootm_argv); } |