From patchwork Mon Aug 20 17:08:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 959841 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="vwV8x+BI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41vL6L51MHz9s8T for ; Tue, 21 Aug 2018 03:15:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726778AbeHTUbt (ORCPT ); Mon, 20 Aug 2018 16:31:49 -0400 Received: from condef-04.nifty.com ([202.248.20.69]:32696 "EHLO condef-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726768AbeHTUbt (ORCPT ); Mon, 20 Aug 2018 16:31:49 -0400 Received: from conuserg-11.nifty.com ([10.126.8.74])by condef-04.nifty.com with ESMTP id w7KH9Z8l002520 for ; Tue, 21 Aug 2018 02:09:35 +0900 Received: from grover.tkatk1.zaq.ne.jp (zaqdadce369.zaq.ne.jp [218.220.227.105]) (authenticated) by conuserg-11.nifty.com with ESMTP id w7KH8lMi020657; Tue, 21 Aug 2018 02:08:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com w7KH8lMi020657 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1534784928; bh=W+ulMFy2DYDNDGT0WCl0WP5mY2rpiCkYnN0RMOcb80Q=; h=From:To:Cc:Subject:Date:From; b=vwV8x+BI6RIrLqIpWj05DWNp4XeSv0xZPdeaEW83PAI9mHInMLx/TkJpdfxJ7aLyO FCZ9SAQeJmPH1j45ypV6wzB3fGlSRA2RjNTrUfjlIoy3ArzgG1mpc5dcBB7BC9ZCL1 JOcCsy2mApd5tXyp9o5U6dJCKfz/d+geFEzI4HxcRdCjbQad7ikQh362LePoG05GmZ KY7AyHn/5HLhsaPIBklUyJXHq3StJ2vuB6cHLAzFmAyr1gmY8vGGqta923Yz3Mrx8p 3bqE+Go9Pbx33h3U8ajCeEMfthGpxhwdNYqnxIAkOgCxRDWYGqa5+c9QV5q2/+yDR/ v26tYMdH5eJkw== X-Nifty-SrcIP: [218.220.227.105] From: Masahiro Yamada To: "David S . Miller" , sparclinux@vger.kernel.org Cc: Randy Dunlap , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] sparc: fix KBUILD_DEFCONFIG for ARCH=sparc32 Date: Tue, 21 Aug 2018 02:08:28 +0900 Message-Id: <1534784908-11692-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org As commit 5ba800962a80 ("kbuild: update ARCH alias info for sparc") addressed, SPARC accepts ARCH=sparc32 as an alias. However, arch/sparc/Makefile wrongly sets KBUILD_DEFCONFIG, then sparc64_defconfig is chosen as the base configuration for ARCH=sparc32. $ make ARCH=sparc32 defconfig *** Default configuration is based on 'sparc64_defconfig' # # configuration written to .config # Fix the logic to choose sparc64_defconfig only when ARCH=sparc64. Signed-off-by: Masahiro Yamada --- arch/sparc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index 966a13d..e32ef20 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -9,10 +9,10 @@ # Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz) # We are not yet configured - so test on arch -ifeq ($(ARCH),sparc) - KBUILD_DEFCONFIG := sparc32_defconfig -else +ifeq ($(ARCH),sparc64) KBUILD_DEFCONFIG := sparc64_defconfig +else + KBUILD_DEFCONFIG := sparc32_defconfig endif ifeq ($(CONFIG_SPARC32),y)