summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-18 00:23:04 -0700
committerOlof Johansson <olof@lixom.net>2013-06-18 00:23:04 -0700
commit99ff1830426ed59cc722091eadffd17736bdf148 (patch)
treec6e2bed35a3233528223d5e57857452e55662f5c /arch/arm/Makefile
parent7bf15412250747277cc53301d550d4894f749b12 (diff)
parentf07cb6a089644e2334c3523af589d9233cc18c74 (diff)
downloadlinux-stable-99ff1830426ed59cc722091eadffd17736bdf148.tar.gz
linux-stable-99ff1830426ed59cc722091eadffd17736bdf148.tar.bz2
linux-stable-99ff1830426ed59cc722091eadffd17736bdf148.zip
Merge tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc
From Santosh Shilimkar: SOC support for Keystone II devices: - Minimal machine and device-tree support with arch_timers and console UART - Reboot hook using PLL reset - Low level debug support using UART - SMP boot support * tag 'keystone-soc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone: ARM: keystone: Enable SMP support on Keystone machines ARM: keystone: Add minimal TI Keystone platform support ARM: dts: keystone: Add minimal Keystone SOC device tree data Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 3380c4f51757..650be0f10416 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -195,6 +195,7 @@ machine-$(CONFIG_PLAT_SPEAR) += spear
machine-$(CONFIG_ARCH_VIRT) += virt
machine-$(CONFIG_ARCH_ZYNQ) += zynq
machine-$(CONFIG_ARCH_SUNXI) += sunxi
+machine-$(CONFIG_ARCH_KEYSTONE) += keystone
# Platform directory name. This list is sorted alphanumerically
# by CONFIG_* macro name.