diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-19 07:48:16 -0400 |
| commit | 3431b392ad50ff37fa3d6e7715c6a99c74d692dc (patch) | |
| tree | 53b6785acaa658a60c6a854af4dea9040f826b48 /arch/arm/mach-meson/board.c | |
| parent | 68ff827ec74fdca8f17d469f22e1032ed14cb795 (diff) | |
| parent | 3fb97e267a5e136d8386a7cb1d5b4fe63af518eb (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-10-19
Highlights this time around:
- Add run time service (power control) support for PSCI (fixed in v3)
- Add efi gop pointer exposure
- SMBIOS support for EFI (on ARM)
- efi pool memory unmap support (needed for 4.8)
- initial x86 efi payload support (fixed up in v2)
- various bug fixes
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
include/tables_csum.h
Diffstat (limited to 'arch/arm/mach-meson/board.c')
| -rw-r--r-- | arch/arm/mach-meson/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-meson/board.c b/arch/arm/mach-meson/board.c index 1dd53e2313f..f159cbf849f 100644 --- a/arch/arm/mach-meson/board.c +++ b/arch/arm/mach-meson/board.c @@ -43,7 +43,7 @@ void dram_init_banksize(void) void reset_cpu(ulong addr) { - psci_system_reset(true); + psci_system_reset(); } static struct mm_region gxbb_mem_map[] = { |