From patchwork Mon Apr 28 06:53:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4075441 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 4CAE0BFF02 for ; Mon, 28 Apr 2014 06:58:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6E55320270 for ; Mon, 28 Apr 2014 06:58:02 +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 EBCCD20295 for ; Mon, 28 Apr 2014 06:58:00 +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 1WefU7-0001Ny-6W; Mon, 28 Apr 2014 06:56:15 +0000 Received: from mail-pa0-f44.google.com ([209.85.220.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WefU2-0000zm-RL for linux-arm-kernel@lists.infradead.org; Mon, 28 Apr 2014 06:56:11 +0000 Received: by mail-pa0-f44.google.com with SMTP id ey11so3593259pad.17 for ; Sun, 27 Apr 2014 23:55:50 -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=AM4tm59i5C/Qm5O3X1PoTUuhZ9gor4bAYQ0XMu9zUxu3IO619D34I80R/AvASZ8Obz rTjktc+Uh6xKjfXXGiJKdSkl8JYxZHfzWgvdrQQ8iDGEeFqVNuS3lb9oQ01L2LZAtczu yESXJex+gDvveLHkDzoSITsSaaJd3hAgD6iEYyBZCnCCuoI83a55L1V8r+NchXPnk3NN rfIDa6u20bi7nRQaMVVWOL35QZcUo2coXMCB9WqchRVcZIGwA5Krm3IVIhZ8R/uQH5ZD dHMjaEANInK/qok/0ze+cJH8p254Gmb/VNBhNUDrwPG2bio7SSkDu+IT2EPQ6mOn+K5h 2pUA== X-Gm-Message-State: ALoCoQm6Q5fkquIkZGEX4IzPOkU6zmyxEHQkY8WOAh2ljRFpKvJmwWEzWG6lM8wRTcUzRVvInHzN X-Received: by 10.68.202.230 with SMTP id kl6mr23653091pbc.55.1398668149985; Sun, 27 Apr 2014 23:55:49 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id sy2sm32699307pbc.28.2014.04.27.23.55.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Apr 2014 23:55:49 -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 Subject: [PATCH v4 11/14] ARM: config: select ARCH_HISI in hi3xxx_defconfig Date: Mon, 28 Apr 2014 14:53:49 +0800 Message-Id: <1398668032-8335-12-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398668032-8335-1-git-send-email-haojian.zhuang@linaro.org> References: <1398668032-8335-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140427_235610_920608_7A2B5EF9 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