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 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
bootm.c
diff --git
a/arch/arm/lib/bootm.c
b/arch/arm/lib/bootm.c
index 488358a33163df342cd00b6543ea17bf8bd72104..2df98d3e01bd8ce175160069452d2429d034fa00 100644
(file)
--- a/
arch/arm/lib/bootm.c
+++ b/
arch/arm/lib/bootm.c
@@
-12,8
+12,13
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <bootstage.h>
#include <command.h>
#include <command.h>
+#include <cpu_func.h>
#include <dm.h>
#include <dm.h>
+#include <hang.h>
+#include <lmb.h>
+#include <log.h>
#include <dm/root.h>
#include <env.h>
#include <image.h>
#include <dm/root.h>
#include <env.h>
#include <image.h>
@@
-27,6
+32,7
@@
#include <linux/compiler.h>
#include <bootm.h>
#include <vxworks.h>
#include <linux/compiler.h>
#include <bootm.h>
#include <vxworks.h>
+#include <asm/cache.h>
#ifdef CONFIG_ARMV7_NONSEC
#include <asm/armv7.h>
#ifdef CONFIG_ARMV7_NONSEC
#include <asm/armv7.h>
@@
-73,6
+79,9
@@
void arch_lmb_reserve(struct lmb *lmb)
gd->bd->bi_dram[bank].size - 1;
if (sp > bank_end)
continue;
gd->bd->bi_dram[bank].size - 1;
if (sp > bank_end)
continue;
+ if (bank_end > gd->ram_top)
+ bank_end = gd->ram_top - 1;
+
lmb_reserve(lmb, sp, bank_end - sp + 1);
break;
}
lmb_reserve(lmb, sp, bank_end - sp + 1);
break;
}
@@
-414,7
+423,7
@@
static void boot_jump_linux(bootm_headers_t *images, int flag)
* DIFFERENCE: Instead of calling prep and go at the end
* they are called if subcommand is equal 0.
*/
* DIFFERENCE: Instead of calling prep and go at the end
* they are called if subcommand is equal 0.
*/
-int do_bootm_linux(int flag, int argc, char *
const argv[],
+int do_bootm_linux(int flag, int argc, char *const argv[],
bootm_headers_t *images)
{
/* No need for those on ARM */
bootm_headers_t *images)
{
/* No need for those on ARM */