mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 03:51:48 +00:00
03fa626774
Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC Conflicts: arch/arm/mach-socfpga/core.h Trivial remove/remove conflict with our cleanup branch. Resolution: remove both sides -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J 0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1 O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38 kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth 17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ GPeeJrJaYQsDvTrO8wjU =ZtPK -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' into test-merge ARM: SoC: platform support for v4.2 Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC Conflicts: arch/arm/mach-socfpga/core.h Trivial remove/remove conflict with our cleanup branch. Resolution: remove both sides # gpg: Signature made Wed Jun 24 21:32:12 2015 PDT using RSA key ID D3FBC665 # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>" # gpg: aka "Kevin Hilman <khilman@linaro.org>" # gpg: aka "Kevin Hilman <khilman@kernel.org>" # Conflicts: # arch/arm/mach-socfpga/core.h
53 lines
1.5 KiB
Makefile
53 lines
1.5 KiB
Makefile
#
|
|
# Copyright (C) 2012-2014 Broadcom Corporation
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License as
|
|
# published by the Free Software Foundation version 2.
|
|
#
|
|
# This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
# kind, whether express or implied; without even the implied warranty
|
|
# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# Cygnus
|
|
obj-$(CONFIG_ARCH_BCM_CYGNUS) += bcm_cygnus.o
|
|
|
|
# BCM281XX
|
|
obj-$(CONFIG_ARCH_BCM_281XX) += board_bcm281xx.o
|
|
|
|
# BCM21664
|
|
obj-$(CONFIG_ARCH_BCM_21664) += board_bcm21664.o
|
|
|
|
# BCM281XX and BCM21664 SMP support
|
|
obj-$(CONFIG_ARCH_BCM_MOBILE_SMP) += kona_smp.o
|
|
|
|
# BCM281XX and BCM21664 L2 cache control
|
|
obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o
|
|
|
|
# Support for secure monitor traps
|
|
obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o
|
|
ifeq ($(call as-instr,.arch_extension sec,as_has_sec),as_has_sec)
|
|
CFLAGS_bcm_kona_smc.o += -Wa,-march=armv7-a+sec -DREQUIRES_SEC
|
|
endif
|
|
|
|
# BCM2835
|
|
obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o
|
|
|
|
# BCM5301X
|
|
obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o
|
|
|
|
# BCM63XXx
|
|
ifeq ($(CONFIG_ARCH_BCM_63XX),y)
|
|
CFLAGS_bcm63xx_headsmp.o += -march=armv7-a
|
|
obj-y += bcm63xx.o
|
|
obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_headsmp.o \
|
|
bcm63xx_pmb.o
|
|
endif
|
|
|
|
ifeq ($(CONFIG_ARCH_BRCMSTB),y)
|
|
CFLAGS_platsmp-brcmstb.o += -march=armv7-a
|
|
obj-y += brcmstb.o
|
|
obj-$(CONFIG_SMP) += platsmp-brcmstb.o
|
|
endif
|