• Olof Johansson's avatar
    Merge branch 'socfpga/hw' into next/soc · 1c75c421
    Olof Johansson authored
    From Dinh Nguyen, this is a series of patches introducing support for
    socfpga hardware (Altera Cyclone5). It also includes a cleanup that
    moves some of the ARMv7 cache maintenance functions to a common location,
    since three other platforms aready implemented it separately.
    
    * socfpga/hw:
      arm: socfpga: Add SMP support for actual socfpga harware
      arm: Add v7_invalidate_l1 to cache-v7.S
      arm: socfpga: Add entries to enable make dtbs socfpga
      arm: socfpga: Add new device tree source for actual socfpga HW
    
    Trivial conflict in arch/arm/mach-tegra/headsmp.S.
    Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
    1c75c421
Makefile 4.8 KB