projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'xilinx-for-v2018.09-rc2' of git://git.denx.de/u-boot-microblaze
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
bootm.c
diff --git
a/arch/arm/lib/bootm.c
b/arch/arm/lib/bootm.c
index 89740657e0c5ef18027c032d4db0fe868acf235d..c3c1d2fdfa2d8ab9d4eacd4a8218f3455fe3a8fc 100644
(file)
--- a/
arch/arm/lib/bootm.c
+++ b/
arch/arm/lib/bootm.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
* - Added prep subcommand support
/* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
* - Added prep subcommand support
@@
-8,8
+9,6
@@
* Marius Groeger <mgroeger@sysgo.de>
*
* Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
* Marius Groeger <mgroeger@sysgo.de>
*
* Copyright (C) 2001 Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-19,7
+18,7
@@
#include <image.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
#include <image.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
-#include <libfdt.h>
+#include <li
nux/li
bfdt.h>
#include <mapmem.h>
#include <fdt_support.h>
#include <asm/bootm.h>
#include <mapmem.h>
#include <fdt_support.h>
#include <asm/bootm.h>
@@
-438,7
+437,7
@@
void boot_prep_vxworks(bootm_headers_t *images)
if (images->ft_addr) {
off = fdt_path_offset(images->ft_addr, "/memory");
if (images->ft_addr) {
off = fdt_path_offset(images->ft_addr, "/memory");
- if (off
<
0) {
+ if (off
>
0) {
if (arch_fixup_fdt(images->ft_addr))
puts("## WARNING: fixup memory failed!\n");
}
if (arch_fixup_fdt(images->ft_addr))
puts("## WARNING: fixup memory failed!\n");
}
@@
-448,6
+447,11
@@
void boot_prep_vxworks(bootm_headers_t *images)
}
void boot_jump_vxworks(bootm_headers_t *images)
{
}
void boot_jump_vxworks(bootm_headers_t *images)
{
+#if defined(CONFIG_ARM64) && defined(CONFIG_ARMV8_PSCI)
+ armv8_setup_psci();
+ smp_kick_all_cpus();
+#endif
+
/* ARM VxWorks requires device tree physical address to be passed */
((void (*)(void *))images->ep)(images->ft_addr);
}
/* ARM VxWorks requires device tree physical address to be passed */
((void (*)(void *))images->ep)(images->ft_addr);
}