diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
| commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch) | |
| tree | 362111f12b9dcf33eb31e165d882957df45fc896 /arch/arm/mach-sunxi | |
| parent | f60d0603edca472c4458b30956f38c6c1a836d66 (diff) | |
| parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff) | |
| download | u-boot-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.gz | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/cpu/armv8/Makefile
arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'arch/arm/mach-sunxi')
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 06a1986efd..6d9518d4c6 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -46,13 +46,15 @@ struct fel_stash fel_stash __attribute__((section(".data"))); static struct mm_region sunxi_mem_map[] = { { /* SRAM, MMIO regions */ - .base = 0x0UL, + .virt = 0x0UL, + .phys = 0x0UL, .size = 0x40000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE }, { /* RAM */ - .base = 0x40000000UL, + .virt = 0x40000000UL, + .phys = 0x40000000UL, .size = 0x80000000UL, .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_INNER_SHARE |