From: Vinayak Kale <vkale@apm.com>
Date: Wed, 24 Apr 2013 09:06:57 +0000 (+0100)
Subject: arm64: Add Kconfig option for APM X-Gene SOC family
X-Git-Tag: next-20130628~118^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=159428538323188158a6058956c16c199909d844;p=karo-tx-linux.git

arm64: Add Kconfig option for APM X-Gene SOC family

This patch adds arm64/Kconfig option for APM X-Gene SOC family.

Signed-off-by: Kumar Sankaran <ksankaran@apm.com>
Signed-off-by: Loc Ho <lho@apm.com>
Signed-off-by: Feng Kan <fkan@apm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ef32eb1aa2d9..1fac4e5a1c43 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -112,6 +112,11 @@ config ARCH_VEXPRESS
 	  This enables support for the ARMv8 software model (Versatile
 	  Express).
 
+config ARCH_XGENE
+	bool "AppliedMicro X-Gene SOC Family"
+	help
+	  This enables support for AppliedMicro X-Gene SOC Family
+
 endmenu
 
 menu "Bus support"
@@ -149,6 +154,8 @@ config NR_CPUS
 	int "Maximum number of CPUs (2-32)"
 	range 2 32
 	depends on SMP
+	# These have to remain sorted largest to smallest
+	default "8" if ARCH_XGENE
 	default "4"
 
 source kernel/Kconfig.preempt