From patchwork Sat Jul 13 03:12:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 2827108 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DDA9FC0AB2 for ; Sat, 13 Jul 2013 03:13:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 044042012E for ; Sat, 13 Jul 2013 03:13:33 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 028232012D for ; Sat, 13 Jul 2013 03:13:32 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxqH2-0005vF-5v; Sat, 13 Jul 2013 03:13:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxqGz-0002wF-L1; Sat, 13 Jul 2013 03:13:25 +0000 Received: from mail-pa0-f53.google.com ([209.85.220.53]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UxqGx-0002vv-Ce for linux-arm-kernel@lists.infradead.org; Sat, 13 Jul 2013 03:13:23 +0000 Received: by mail-pa0-f53.google.com with SMTP id tj12so9472302pac.40 for ; Fri, 12 Jul 2013 20:13:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=SUwF0Xpo/89FJl6fFWMd6D4L7XQmpFGLga7NpyzuHmc=; b=kMrpMCS5pAcugExM92lhytSV9CbKdSmNThyrPVQIzILsLOLpAgUdZ4BE0CpfkUmIsE bEv42FOibnat4tCyly2uLthW3OYX2TwITxdzD5RxRk/TINeOeP8xBVmt6F89vAutSWzT WQmGSn/Qfm5Ke9aa0doU4izckkBSoGavKEseq3kv3SnUSOQZtETrpv/Vn9k0Sy/Z9IJD rvXTnDCzFix7ZMuFVN+XFgy3TGRNoIEejp1V+kTEoQdyyfmyHF0NTWu0ENWjbqjyTxV8 tO05PYSWUDjzDRNCK+atDtE9bajsj0H5bzN6Aw7yLLrksFyjbx6kpvpKjMubNVVKC28h FTUQ== X-Received: by 10.68.254.74 with SMTP id ag10mr44633598pbd.81.1373685181764; Fri, 12 Jul 2013 20:13:01 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id dg3sm48214368pbc.24.2013.07.12.20.13.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Jul 2013 20:13:00 -0700 (PDT) From: Olof Johansson To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: multi_v7_defconfig: Tweaks for omap and sunxi Date: Fri, 12 Jul 2013 20:12:54 -0700 Message-Id: <1373685174-7918-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.8.1.192.gc4361b8 X-Gm-Message-State: ALoCoQmfzKM5cI9vd4EQNpzVNCdp29eMOz47jVo+uACWFJ2GBK8Uw646UPKCUAFum8EPuEgKyca6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130712_231323_513984_36A5F9CB X-CRM114-Status: UNSURE ( 8.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: tony@atomide.com, Olof Johansson , linux@arm.linux.org.uk, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP OMAP recently changed how the platforms are configured, so OMAP2/3/4 SoC support is no longer enabled by default. Add them back. Enable new ethernet driver for sunxi. The i.MX console options moved due to resorting, no functional change. Signed-off-by: Olof Johansson --- The OMAP changes are needed to deal with the dependency flip from OMAP2PLUS being on and defaulting the SoCs accordingly, to the SoC options selecting OMAP2PLUS. See the "ARM: OMAP2+: Remove board-4430sdp.c" for background. arch/arm/configs/multi_v7_defconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 80aacc6..fcd2b9b 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -15,8 +15,10 @@ CONFIG_SOC_IMX53=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y CONFIG_SOC_VF610=y -CONFIG_ARCH_OMAP2PLUS=y +CONFIG_ARCH_OMAP3=y +CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP5=y +CONFIG_SOC_AM33XX=y CONFIG_SOC_AM43XX=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SOCFPGA=y @@ -57,6 +59,7 @@ CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_HIGHBANK=y CONFIG_SATA_MV=y CONFIG_NETDEVICES=y +CONFIG_SUN4I_EMAC=y CONFIG_NET_CALXEDA_XGMAC=y CONFIG_SMSC911X=y CONFIG_STMMAC_ETH=y @@ -70,6 +73,8 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_SERIAL_SIRFSOC=y CONFIG_SERIAL_SIRFSOC_CONSOLE=y CONFIG_SERIAL_TEGRA=y +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y CONFIG_SERIAL_OF_PLATFORM=y @@ -77,8 +82,6 @@ CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y -CONFIG_SERIAL_IMX=y -CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_FSL_LPUART=y CONFIG_SERIAL_FSL_LPUART_CONSOLE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y