]> git.ipfire.org Git - people/ms/u-boot.git/commit
arm/arm64: Move barrier instructions into separate header
authorAndre Przywara <andre.przywara@arm.com>
Thu, 12 May 2016 11:14:41 +0000 (12:14 +0100)
committerTom Rini <trini@konsulko.com>
Thu, 12 May 2016 15:13:03 +0000 (11:13 -0400)
commit1ea4fac5a34604e67504ee6537bb01e809528cd4
treea00ff7f5f48cc255bdea84ba7a4181a0feb1b622
parent4baca92001bff3c32a05001a7dc58996623e3ef8
arm/arm64: Move barrier instructions into separate header

Commit bfb33f0bc45b ("sunxi: mctl_mem_matches: Add missing memory
barrier") broke compilation for the Pine64, as dram_helper.c now
includes <asm/armv7.h>, which does not compile on arm64.

Fix this by moving all barrier instructions into a separate header
file, which can easily be shared between arm and arm64.
Also extend the inline assembly to take the "sy" argument, which is
optional for ARMv7, but mandatory for v8.

This fixes compilation for 64-bit sunxi boards (Pine64).

Acked-by: Ian Campbell <ijc@hellion.org.uk>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
arch/arm/include/asm/armv7.h
arch/arm/include/asm/barriers.h [new file with mode: 0644]
arch/arm/mach-sunxi/dram_helpers.c