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 branch 'master' of git://git.denx.de/u-boot-mmc
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
bootm-fdt.c
diff --git
a/arch/arm/lib/bootm-fdt.c
b/arch/arm/lib/bootm-fdt.c
index d4f1578e9e96fcdbd1434b5c5e663339844ada83..a51755070bc93bad6cb4e05618613afb07c58d9c 100644
(file)
--- a/
arch/arm/lib/bootm-fdt.c
+++ b/
arch/arm/lib/bootm-fdt.c
@@
-17,10
+17,15
@@
#include <common.h>
#include <fdt_support.h>
#include <common.h>
#include <fdt_support.h>
+#ifdef CONFIG_ARMV7_NONSEC
#include <asm/armv7.h>
#include <asm/armv7.h>
+#endif
+#include <asm/psci.h>
+#include <asm/spin_table.h>
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
+#ifdef CONFIG_ARCH_FIXUP_FDT
int arch_fixup_fdt(void *blob)
{
bd_t *bd = gd->bd;
int arch_fixup_fdt(void *blob)
{
bd_t *bd = gd->bd;
@@
-31,14
+36,29
@@
int arch_fixup_fdt(void *blob)
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
start[bank] = bd->bi_dram[bank].start;
size[bank] = bd->bi_dram[bank].size;
for (bank = 0; bank < CONFIG_NR_DRAM_BANKS; bank++) {
start[bank] = bd->bi_dram[bank].start;
size[bank] = bd->bi_dram[bank].size;
+#ifdef CONFIG_ARMV7_NONSEC
+ ret = armv7_apply_memory_carveout(&start[bank], &size[bank]);
+ if (ret)
+ return ret;
+#endif
}
ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
}
ret = fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
-#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV7_VIRT)
if (ret)
return ret;
if (ret)
return ret;
- ret = armv7_update_dt(blob);
+#ifdef CONFIG_ARMV8_SPIN_TABLE
+ ret = spin_table_update_dt(blob);
+ if (ret)
+ return ret;
+#endif
+
+#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI)
+ ret = psci_update_dt(blob);
+ if (ret)
+ return ret;
#endif
#endif
- return ret;
+
+ return 0;
}
}
+#endif