From patchwork Fri Oct 6 01:24:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115016 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1217869qgn; Thu, 5 Oct 2017 18:25:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC20mGcGlgk3KEYESvl0NL6s98lSXH2AbDGYFZ7G1QTXkGEWxDgI1a6iwwvUZ9+dMg5FdRG X-Received: by 10.80.165.149 with SMTP id a21mr919576edc.83.1507253109245; Thu, 05 Oct 2017 18:25:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507253109; cv=none; d=google.com; s=arc-20160816; b=rOjdgRkSh9mbNsFf90jgVFc5yrrwILKuZ10KZmfEWj6LULcmfGffCqGMFFtnY78Gw0 EdLfgvsojLVfTHx1xgJU2/Xg2Xlwae+7WyZmOz87Ew8LW9HC6PWY2RTcw10CNaUZmEn0 +Vh10S0iyWQn9O9eDXJSbBNicGaBC09FOV4LfDsST6JeHMOX9/3GMqe9L9fzKt+ziAz3 mJOV5MQLxH3qEAi/rr31ZTJ1BhY24nZn+r2CHXLeYych2/obx6CDEHWoiA0++mSzZKzM vtmyLI22KonjZ4iITLQNp/nGhbiV3qir/OwdefzpBMrKzLf/GWgmvV4zP8hQFri9JKmJ l/PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :dkim-filter:arc-authentication-results; bh=aDhjQDsVQyAp67JfDuyGUpy5IkdRXy/fSDjRFQD8Aps=; b=hxbskzl4OZm9qofm0U66S6BVWkZKu8zTzDtlBxXq2Xx6i1XgLt2nXPIOOcEPlAeKmg 1pmGCZxNiweTbhpNfY0Oo5LuxgihSUu15FOlBpAHl5VESis4qoAGJDSdud4OEoSR6z8p 7fOVtzS0bY6CN9P+wJQXxEuaUFevl21G2Gb0sLxYFu8BpWRp+gDnmBxu57qihR9KE/8k Yc9ffFBXCLlEP5FEEQfNNREOrsbZpQOYO/N//2jJCCQq1uHbUia3AMhg/YRsaM4yMmXL xSyLNws5RkxTO+ulUckl7FqFXGmLaniQ1X/H/l8mlHgZDydcWBq+e2UppewaQKdgDHIf DRWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=dnOIxap3; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l33si656290edd.186.2017.10.05.18.25.08; Thu, 05 Oct 2017 18:25:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=dnOIxap3; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 0F910C21DE6; Fri, 6 Oct 2017 01:25:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 62754C21C34; Fri, 6 Oct 2017 01:25:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DF382C21C34; Fri, 6 Oct 2017 01:25:02 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id BA143C21C2B for ; Fri, 6 Oct 2017 01:25:00 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v961OjAm015562; Fri, 6 Oct 2017 10:24:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v961OjAm015562 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507253085; bh=KLp/uaEa6ePEonOcSYdKK9Es+uE5JMhCr2dR2/xd8WI=; h=From:To:Cc:Subject:Date:From; b=dnOIxap34VM0+hpZXzetuqaBSEX/QJrEi+F0KQfsQghgZwEPlB+Vea3jojdhegjjL TVj7FQKZwzZKwZkuSpIz1AT/nRnCBGzAr5hnJ3ou/BzsqZ4mcGjgHREt5Hw1nSXRwr PVcpj/jdH39VXmZn9YPo0wpPBA0mk7qlKxmZmT6WjxmZnEVNeQeYA2vfcgQY0BnozL FusqFa0sdUGLm1F4DnZ6eeFHfp50mQt7rRt7fzjgiY7QSReBiTyMOX85HH5Vk2M36A feqECe7zFT0NDkl08mjeLAvklK7Jg2bzD5cHcjxvDfjMCN7/chpzvF0lAJMgiwbA3J 1cmkSbalbw7ww== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Fri, 6 Oct 2017 10:24:43 +0900 Message-Id: <1507253083-18367-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH] fixdep: fix dependency on options surrounded by CONFIG_VAL() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" CONFIG options surrounded by CONFIG_IS_ENABLED(...) CONFIG_IS_BUILTIN(...) CONFIG_IS_MODULE(...) CONFIG_VAL(...) need special care for proper dependency tracking. I do not remember why, but I missed to add CONFIG_VAL(...) handling. Signed-off-by: Masahiro Yamada --- scripts/basic/fixdep.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index 9bd0de2..da7fb2c 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c @@ -249,10 +249,17 @@ static void parse_config_file(const char *map, size_t len) if (q - p < 0) continue; - /* U-Boot also handles CONFIG_IS_{ENABLED/BUILTIN/MODULE} */ + /* + * U-Boot also handles + * CONFIG_IS_ENABLED(...) + * CONFIG_IS_BUILTIN(...) + * CONFIG_IS_MODULE(...) + * CONFIG_VAL(...) + */ if ((q - p == 10 && !memcmp(p, "IS_ENABLED(", 11)) || (q - p == 10 && !memcmp(p, "IS_BUILTIN(", 11)) || - (q - p == 9 && !memcmp(p, "IS_MODULE(", 10))) { + (q - p == 9 && !memcmp(p, "IS_MODULE(", 10)) || + (q - p == 3 && !memcmp(p, "VAL(", 4))) { p = q + 1; for (q = p; q < map + len; q++) if (*q == ')')