diff options
| author | Tom Rini | 2021-07-27 09:11:25 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-07-27 09:11:25 -0400 |
| commit | 0d4823fbebae6ebbf558a9325d86b37c67d848d9 (patch) | |
| tree | 46c84c5039fc1d2ce0ff441e32603de406976db5 /arch/arm/mach-stm32mp/cpu.c | |
| parent | df59b7d23be71db03275e4c1b243e67397b50f9a (diff) | |
| parent | 65b3f56d42e5ddc9183843723cf735950f062410 (diff) | |
Merge tag 'u-boot-stm32-20210727' of https://source.denx.de/u-boot/custodians/u-boot-stm
- FIP Enable OP-TEE and TZC support in SPL for STM32MP15 SoC
- Add stm32mp15 missing SPI clock support
- Manage pull-up on gpio button STM32MP15 boards
- Correct STM32MP15 boot when TAMPER registers are invalid
- Fix EMMC pinmux on STM32MP15 Avenger96 board
Diffstat (limited to 'arch/arm/mach-stm32mp/cpu.c')
| -rw-r--r-- | arch/arm/mach-stm32mp/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index f6ed2ce0e4d..eb79f3ffd2c 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -556,7 +556,9 @@ static void setup_boot_mode(void) env_set("boot_instance", "0"); break; default: - log_debug("unexpected boot mode = %x\n", boot_mode); + env_set("boot_device", "invalid"); + env_set("boot_instance", ""); + log_err("unexpected boot mode = %x\n", boot_mode); break; } |