diff options
author | Bin Meng <bmeng.cn@gmail.com> | 2021-02-25 17:22:55 +0800 |
---|---|---|
committer | Priyanka Jain <priyanka.jain@nxp.com> | 2021-03-05 10:25:44 +0530 |
commit | c8f911cb08fcb6216424be5a6904a1ed237c4318 (patch) | |
tree | 211b04ac346bd04575b306a84cc984208b3591eb /board/freescale/qemu-ppce500 | |
parent | 9a39f76c7ac06ba04235b4192c1f4daf5094a924 (diff) | |
download | u-boot-c8f911cb08fcb6216424be5a6904a1ed237c4318.zip u-boot-c8f911cb08fcb6216424be5a6904a1ed237c4318.tar.gz u-boot-c8f911cb08fcb6216424be5a6904a1ed237c4318.tar.bz2 |
ppc: qemu: Delete the temporary FDT virtual-physical mapping after U-Boot is relocated
After U-Boot is relocated to RAM already, the previous temporary FDT
virtual-physical mapping that was used in the pre-relocation phase
is no longer needed. Let's delete the mapping.
get_fdt_virt() might be used before and after relocation, update it
to return different virtual address of FDT.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
Diffstat (limited to 'board/freescale/qemu-ppce500')
-rw-r--r-- | board/freescale/qemu-ppce500/qemu-ppce500.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/board/freescale/qemu-ppce500/qemu-ppce500.c b/board/freescale/qemu-ppce500/qemu-ppce500.c index 9c30c12..480776a 100644 --- a/board/freescale/qemu-ppce500/qemu-ppce500.c +++ b/board/freescale/qemu-ppce500/qemu-ppce500.c @@ -31,7 +31,10 @@ DECLARE_GLOBAL_DATA_PTR; static void *get_fdt_virt(void) { - return (void *)CONFIG_SYS_TMPVIRT; + if (gd->flags & GD_FLG_RELOC) + return (void *)gd->fdt_blob; + else + return (void *)CONFIG_SYS_TMPVIRT; } static uint64_t get_fdt_phys(void) @@ -138,6 +141,12 @@ int misc_init_r(void) */ virtio_init(); + /* + * U-Boot is relocated to RAM already, let's delete the temporary FDT + * virtual-physical mapping that was used in the pre-relocation phase. + */ + disable_tlb(find_tlb_idx((void *)CONFIG_SYS_TMPVIRT, 1)); + return 0; } |