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: 144652 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4217243ljj; Mon, 20 Aug 2018 10:09:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPzmGcDW3s+/1EU+D0ctVE0AMlNIhh8LOT6m27u5ZrYxrYQFBnpIraiWNUR4gLwv02kBH/CF X-Received: by 2002:a17:902:722:: with SMTP id 31-v6mr46456768pli.207.1534784979919; Mon, 20 Aug 2018 10:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534784979; cv=none; d=google.com; s=arc-20160816; b=Von4uVO3Ts1wkKNjpApRQEzZNwa8BDeCkwg9ylmywP7Sr3owN5Gef2+7PtMyJlMaAP b78jP8IUHCdC8dYv52pOR5kSQCmV3nox4ljixZDaKv6kVXaxj7sGUYaMTuebmtJ+9h3D he7GX8rRKQbCLoFocsK9JYKGJlJUvyqoKu7JplMX7nmqyl7MIHxSJYXT+qpwNedhKK2V iKpVQWOaPnlE+/eR6STOiAma+d2X8T4G+3tegjsJVHsOH+OkaIwzTlYF/AMQdVD6CtQb SxHsCdYuXrtC8EidLjk8KYB3YdG49zfUGr50BTtunhA2t14WWGKTtlERbTyHHty/xSP7 /voA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=W+ulMFy2DYDNDGT0WCl0WP5mY2rpiCkYnN0RMOcb80Q=; b=MF6LyrMAIYM6xl6+ckiMr3U3A0xpStxLRvZIbfW1ihf5cok6ptXm/vDkgG/RET0U21 9bifZVTZQ5eRzCx2fYCK0pX1Wgz7OcC0be2JZY+2HvBj2+3drdN8Fi/7wLXKRxhXC/Ht EEf31Kjj61CoIUzhp3p77xOox9owl72ddKCRkyyxxm+vj06ZiCo/ocipJHjZ3oz1e3J6 gTV1Bg9Fy47jX/dGfNLOr9vUR3GCVzTooBr45u2ekNX/8nHciVteMGp7V80G0eIJdLBC rlJEUhEiCwKIUOsCs0Mgs42l62Of4W/1Qtj/jsSPlcZoSUdEMLI0LPLomMObAf7UQqTM LWEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vwV8x+BI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p64-v6si9765721pga.25.2018.08.20.10.09.39; Mon, 20 Aug 2018 10:09:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vwV8x+BI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727097AbeHTU0C (ORCPT + 32 others); Mon, 20 Aug 2018 16:26:02 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:58370 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbeHTU0C (ORCPT ); Mon, 20 Aug 2018 16:26:02 -0400 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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) -- 2.7.4 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)