diff options
| author | Tom Rini | 2018-04-09 11:05:44 -0400 |
|---|---|---|
| committer | Tom Rini | 2018-04-09 11:05:44 -0400 |
| commit | 844fb498cc978608ec88bdf29913c0d46c85bfff (patch) | |
| tree | 2baa468bf3b9148a0a6c76b9bc7e1b8333b02f72 /arch/arm/mach-bcm283x | |
| parent | 3404a0b38291a11a70064c4218066e9d7eb56ca9 (diff) | |
| parent | f4cf153a487486428a061b5d866fe2f68653b2f8 (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-04-09
Highlights this time around:
- Lots of minor spec compliance fixes
- Support full range of GOP BLT commands
- More fine grained error checking
- Network fixes (init, DP)
- Lots of other bug fixes...
Diffstat (limited to 'arch/arm/mach-bcm283x')
| -rw-r--r-- | arch/arm/mach-bcm283x/reset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-bcm283x/reset.c b/arch/arm/mach-bcm283x/reset.c index b62cb8a51ee..aa02d3f9f6a 100644 --- a/arch/arm/mach-bcm283x/reset.c +++ b/arch/arm/mach-bcm283x/reset.c @@ -63,6 +63,7 @@ void __efi_runtime EFIAPI efi_reset_system( switch (reset_type) { case EFI_RESET_COLD: case EFI_RESET_WARM: + case EFI_RESET_PLATFORM_SPECIFIC: reset_cpu(0); break; case EFI_RESET_SHUTDOWN: @@ -82,9 +83,9 @@ void __efi_runtime EFIAPI efi_reset_system( while (1) { } } -void efi_reset_system_init(void) +efi_status_t efi_reset_system_init(void) { - efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs)); + return efi_add_runtime_mmio(&wdog_regs, sizeof(*wdog_regs)); } #endif |