From patchwork Wed Sep 15 18:25:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 183142 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8FITBSQ029174 for ; Wed, 15 Sep 2010 18:29:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754887Ab0IOS0Y (ORCPT ); Wed, 15 Sep 2010 14:26:24 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:41754 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754370Ab0IOS0L (ORCPT ); Wed, 15 Sep 2010 14:26:11 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o8FIPt3x010281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 15 Sep 2010 13:25:57 -0500 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o8FIPp4L008167; Wed, 15 Sep 2010 23:55:52 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Wed, 15 Sep 2010 23:55:51 +0530 From: "Shilimkar, Santosh" To: Tony Lindgren CC: Russell King - ARM Linux , "linux-arm-kernel@lists.infradead.org" , "linux-omap@vger.kernel.org" , "bryan.wu@canonical.com" Date: Wed, 15 Sep 2010 23:55:50 +0530 Subject: RE: [PATCH] omap: Update omap3_defconfig to work with SMP_ON_UP Thread-Topic: [PATCH] omap: Update omap3_defconfig to work with SMP_ON_UP Thread-Index: ActU8K4XApKkz+RVQs+Kg6SggPqNAAAETUSg Message-ID: References: <20100817104414.19061.38999.stgit@baageli.muru.com> <20100906104413.GD20903@n2100.arm.linux.org.uk> <20100914185907.GG8647@atomide.com> <20100914190314.GH8647@atomide.com> <20100914202743.GK8647@atomide.com> <20100915161126.GS8647@atomide.com> In-Reply-To: <20100915161126.GS8647@atomide.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Sep 2010 18:29:12 +0000 (UTC) diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap2plus_defconfig similarity index 99% rename from arch/arm/configs/omap3_defconfig rename to arch/arm/configs/omap2plus_defconfig index 833a9bc..3d27dd0 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -53,6 +53,7 @@ CONFIG_MACH_SBC3530=y CONFIG_MACH_OMAP_3630SDP=y CONFIG_MACH_OMAP_4430SDP=y CONFIG_ARM_THUMBEE=y +CONFIG_ARM_L1_CACHE_SHIFT=5 CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_SMP=y @@ -139,6 +140,8 @@ CONFIG_SMSC_PHY=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=y CONFIG_SMSC911X=y +CONFIG_KS8851=y +CONFIG_KS8851_MLL=y CONFIG_LIBERTAS=y CONFIG_LIBERTAS_USB=y CONFIG_LIBERTAS_SDIO=y diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b48bacf..bb85f24 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -35,7 +35,7 @@ config ARCH_OMAP3 default y select CPU_V7 select USB_ARCH_HAS_EHCI - select ARM_L1_CACHE_SHIFT_6 + select ARM_L1_CACHE_SHIFT_6 if !ARCH_OMAP4 config ARCH_OMAP4 bool "TI OMAP4" @@ -43,6 +43,8 @@ config ARCH_OMAP4 depends on ARCH_OMAP2PLUS select CPU_V7 select ARM_GIC + select PL310_ERRATA_588369 + select ARM_ERRATA_720789 comment "OMAP Core Type" depends on ARCH_OMAP2