From 30eeca1c925640f87813244b28222e49011ccf69 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 5 Sep 2012 17:47:44 +0100
Subject: [PATCH] --- yaml --- r: 367261 b: refs/heads/master c:
 1ae90e79051318c34d5a75c2ef5b9a55bd22f2ed h: refs/heads/master i:   367259:
 92b5a3da013b697a72768e339b3bf046d26e979e v: v3

---
 [refs]                                  |  2 +-
 trunk/arch/arm64/Kconfig                | 11 ++++++++++-
 trunk/arch/arm64/configs/defconfig      |  4 ++++
 trunk/drivers/net/ethernet/smsc/Kconfig |  4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 213cbeb63372..177cffeb2c0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90556ca1ebdd01fbedaf9e56a826d4ce84346466
+refs/heads/master: 1ae90e79051318c34d5a75c2ef5b9a55bd22f2ed
diff --git a/trunk/arch/arm64/Kconfig b/trunk/arch/arm64/Kconfig
index 9b6d19f74078..73b6e764034c 100644
--- a/trunk/arch/arm64/Kconfig
+++ b/trunk/arch/arm64/Kconfig
@@ -99,7 +99,16 @@ source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
 
-menu "System Type"
+menu "Platform selection"
+
+config ARCH_VEXPRESS
+	bool "ARMv8 software model (Versatile Express)"
+	select ARCH_REQUIRE_GPIOLIB
+	select COMMON_CLK_VERSATILE
+	select VEXPRESS_CONFIG
+	help
+	  This enables support for the ARMv8 software model (Versatile
+	  Express).
 
 endmenu
 
diff --git a/trunk/arch/arm64/configs/defconfig b/trunk/arch/arm64/configs/defconfig
index 09bef29f3a09..8d9696adb440 100644
--- a/trunk/arch/arm64/configs/defconfig
+++ b/trunk/arch/arm64/configs/defconfig
@@ -23,6 +23,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_ARCH_VEXPRESS=y
 CONFIG_SMP=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_CMDLINE="console=ttyAMA0"
@@ -47,11 +48,14 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
+CONFIG_SMC91X=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
 CONFIG_FB=y
diff --git a/trunk/drivers/net/ethernet/smsc/Kconfig b/trunk/drivers/net/ethernet/smsc/Kconfig
index 5a689af516e9..bb4c1674ff99 100644
--- a/trunk/drivers/net/ethernet/smsc/Kconfig
+++ b/trunk/drivers/net/ethernet/smsc/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_SMSC
 	bool "SMC (SMSC)/Western Digital devices"
 	default y
-	depends on ARM || ISA || MAC || ARM || MIPS || M32R || SUPERH || \
+	depends on ARM || ISA || MAC || ARM64 || MIPS || M32R || SUPERH || \
 		BLACKFIN || MN10300 || COLDFIRE || PCI || PCMCIA
 	---help---
 	  If you have a network (Ethernet) card belonging to this class, say Y
@@ -40,7 +40,7 @@ config SMC91X
 	select NET_CORE
 	select MII
 	depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
-		    MN10300 || COLDFIRE)
+		    MN10300 || COLDFIRE || ARM64)
 	---help---
 	  This is a driver for SMC's 91x series of Ethernet chipsets,
 	  including the SMC91C94 and the SMC91C111. Say Y if you want it