From patchwork Tue May 20 13:10:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4209801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A8E69F32A for ; Tue, 20 May 2014 13:17:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2603C202FE for ; Tue, 20 May 2014 13:17:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A98232021F for ; Tue, 20 May 2014 13:17:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wmjsw-0006jw-3v; Tue, 20 May 2014 13:15:14 +0000 Received: from mail-pb0-f50.google.com ([209.85.160.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wmjrq-0004Iv-BW for linux-arm-kernel@lists.infradead.org; Tue, 20 May 2014 13:14:07 +0000 Received: by mail-pb0-f50.google.com with SMTP id ma3so316293pbc.9 for ; Tue, 20 May 2014 06:13:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4RLznekMVhuNsMHXFDVYEHSk3xQq/8vNjIp7DVMt67Y=; b=WbK2JNQDPoHh44732Mn5rRSarkvNPisAfI3+PTT9SF7QRx+PLnuy7Zd0xR0RNKSuG6 rw2hCSC27qutmOxqjVZlp2Jc/A0tPYEE+0/mjkPxsfJxJFwpp1CPEdy41Ks80WjGlqkr d0mas0Sz26tlxtenJDRJ7IongvFz6pvF1P/Mu8C69fEGVlSLsMlvF7HlcGt1ZWIfhLBz upO8mtwslxu4Si/VntUK7NtocVPtnr6+lulfvw3bDlMAfUQV0LHpUKBF3UZwKyNu7t2L gmuYMJeMZQk7CMGUffn0zoQLEsc1ug/s4d+i5y5Z5vGMherKAJDvUzjfEnF559E/Yz6s pt0Q== X-Gm-Message-State: ALoCoQm4BX4q1PPsi/N2mQzC00oXvkiKD2r27Wrq5CDAaPnVCy0xaYWWPaDnfCqwMQpGmbQ1tgs4 X-Received: by 10.68.134.198 with SMTP id pm6mr50977693pbb.9.1400591624815; Tue, 20 May 2014 06:13:44 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id av4sm31085722pac.8.2014.05.20.06.13.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 May 2014 06:13:43 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, xuwei5@hisilicon.com, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org, marc.zyngier@arm.com, jason@lakedaemon.net Subject: [PATCH v9 12/14] ARM: config: select ARCH_HISI in hi3xxx_defconfig Date: Tue, 20 May 2014 21:10:25 +0800 Message-Id: <1400591427-21922-13-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400591427-21922-1-git-send-email-haojian.zhuang@linaro.org> References: <1400591427-21922-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140520_061406_429066_29E4A33C X-CRM114-Status: UNSURE ( 8.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Haojian Zhuang 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=-2.5 required=5.0 tests=BAYES_00,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 Since ARCH_HISI is added as common configuration of both ARCH_HI3xxx and ARCH_HIP04, update it into hi3xxx_defconfig. Signed-off-by: Haojian Zhuang --- arch/arm/configs/hi3xxx_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/hi3xxx_defconfig b/arch/arm/configs/hi3xxx_defconfig index f186bdf..553e1b6 100644 --- a/arch/arm/configs/hi3xxx_defconfig +++ b/arch/arm/configs/hi3xxx_defconfig @@ -3,10 +3,12 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_BLK_DEV_INITRD=y CONFIG_RD_LZMA=y +CONFIG_ARCH_HISI=y CONFIG_ARCH_HI3xxx=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y +CONFIG_HIGHMEM=y CONFIG_ARM_APPENDED_DTB=y CONFIG_NET=y CONFIG_UNIX=y