From patchwork Fri Mar 8 03:38:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 778816 Delivered-To: patch@linaro.org Received: by 2002:a5d:604e:0:b0:33e:7753:30bd with SMTP id j14csp74677wrt; Thu, 7 Mar 2024 19:38:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVH3C2BJrblk1dOwh9omltd8arMISY0/7hBaA02wr66LxuecwCyeYXaRlFrncAhPFpssFU9+kCUVqbtSe13qFx4 X-Google-Smtp-Source: AGHT+IH+IE7l5QvXBRaR0iUoEQiQI/6DdeEKIQQbf9kG4OXHKyL5XqtbFX8dBsUvAT1yTfy2+O1L X-Received: by 2002:adf:cb8d:0:b0:33d:44d8:eacc with SMTP id q13-20020adfcb8d000000b0033d44d8eaccmr11853372wrh.39.1709869109714; Thu, 07 Mar 2024 19:38:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709869109; cv=none; d=google.com; s=arc-20160816; b=NjLbwkL0mwC1WPYIXlzkEtBWStv+EhW2XGmgsMoXofCXkREGtzE/J7Pu6OGi75CXKx weZZqBj3Lq5QjXkkESAG+pdh4PU/SsBYkCrcKkLM56tx4bdo+mf3elaq651Lb4nCKHaL efCvvHY4+l0rG2ZOioR4LQiwOyV+jGKNkwJMW+5wLmPNkBt+Owv1nK3+sX245QTHHr5p hNGIw4GbjtF51RJnApYfrotl6MJJgvTUViesNJ6jD5idcEW6oBFpfFpcwS0isj5D2n9S ++iwcLiEZ6gmceuRM//2ol1WjXol1wJoAlLbli4LFycxJMNoOlzCSoBL3l0jEMIL0VWV SDew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=1WLl5z9RipY9bRZgz65vMYVn9bonA88ZTuGSEY2xtpo=; fh=ili3jpOZALxYhCmUzuXhDziAebo5qyy9rLeMkOxiAWM=; b=ZELunXIdMuMfw4uccw93xmqDAKzNBBARgZCdiZ09wwnknuiuWgDKyugeJgO89tkq7I ND/YSW30hQnx+qcYnX0789dNMDztLo9m27Cmx1X7lbeKREXT1w4F4iT1+8De/9YgEJdm /q8Lve6lMQcXMvndO6dqZQIWp+vwFoDaAtUOv9U57dsLptFeP36N0paRh1MpI8/vluUg uCEcAhQJWixIoIDt5ttJpCN3QRzODMKE7Cr9lTlKIEhOyhvKxxFUP/s+XAuY4ITyC1X6 5UMUyE7UcgCM/u2cuiS9qqowNn9a5J4lvaVMK9wBXHIN5jHfnBBd49Wxpt08EW0VCzIo N5EQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MAX7Jn88; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id e7-20020a5d65c7000000b0033e16547801si9051388wrw.631.2024.03.07.19.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 19:38:29 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MAX7Jn88; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E4AB87E1C; Fri, 8 Mar 2024 04:38:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="MAX7Jn88"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50F4587E1C; Fri, 8 Mar 2024 04:38:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 04CFD87150 for ; Fri, 8 Mar 2024 04:38:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=semen.protsenko@linaro.org Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6e4f7e1af80so179213a34.3 for ; Thu, 07 Mar 2024 19:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709869103; x=1710473903; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1WLl5z9RipY9bRZgz65vMYVn9bonA88ZTuGSEY2xtpo=; b=MAX7Jn88hJKUYqeUxhj03fVpoAdwnCXttywN3CXP7j8f3W7EGpneg2Kqummn7TXoA7 CGREMOU9rdrBzqJ44EBesvfU2ygqSN37fhLKFkUOITDJ9m5DXjjVKlSJmfjbmXE5tZUG QbvF58W3jpEA4VbCui8oKh6+9GJ1bDR8OOH38B6vw6LJKol2W4DRNQ2EN7nr9YBhUq/W 8Q4yVwgrlWV3rRNCAmz3XO9tbdV2kehtVB6ejo7Prt4FoR89ee58O6Myl0FxCBrRsJ2t xpqMwrMf0G0/FXYpmeqwHcJTkAFyCLmGN1s/VbjP6puZOkMk2+Ub6oa5j/4ZJNNO91ni VMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709869103; x=1710473903; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1WLl5z9RipY9bRZgz65vMYVn9bonA88ZTuGSEY2xtpo=; b=pPOA7gwBVtDgwiDLPi4Ydg85s9aip4nHfWvdXlBKNDTWd/BE7oww9iFryr3eMtiKnr sulh5j40B2KzS9gj4e9ocCSq51vBlhN3vb3eMlssFVkfQDHHlW4htrxvUiuWZOyHkNfc UAuTEK5vvpWW0ipRqhWvqCF2ieOt7eUBeou5H3pxi0yIB8UEUIW2lK82yvf1uL+huQCw t2dYygLr/5DiKtTDb8RQ2wESO0ggS8j1avoBeNmYRqf1OsTAVSYwFzsAFG+Y3g6UL9Gq 2Rqjmh1L6OZz1gUjSgDCUZ+EWs77N5wLLkP6I4/TMCjDCi1TaZQC/WaiutPw3awXwTB7 ctew== X-Forwarded-Encrypted: i=1; AJvYcCUFFYuZaSNfGatIz7gwcvw6LzV5rU1wLnbeskHAq04LdI+w93N/OjCdkTAyfx0pjk98cQ9BHFIOtHdNsFA5ahgqtA5lKQ== X-Gm-Message-State: AOJu0YzH2kZfCx0ktD7Rs2v8n8ULEie9iuK+H9HcYEJyFj80UjXkBfhP IUDA2F2OCyE02WZ5V/aEFO0/I0PCjJ1+t3g/xe7l2Oa/qRa7Ja8cZeQJb3tdSiY= X-Received: by 2002:a9d:684b:0:b0:6e5:704:63fc with SMTP id c11-20020a9d684b000000b006e5070463fcmr4926029oto.34.1709869103612; Thu, 07 Mar 2024 19:38:23 -0800 (PST) Received: from localhost ([136.62.192.75]) by smtp.gmail.com with ESMTPSA id h5-20020a4a6f05000000b005a0c309dd0asm3660954ooc.46.2024.03.07.19.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 19:38:23 -0800 (PST) From: Sam Protsenko To: Tom Rini Cc: Simon Glass , Joao Marcos Costa , John Clark , Michael Trimarchi , Rong Tao , Christophe Leroy , Marek Vasut , Jesse Taube , Nishanth Menon , Andrew Davis , Jason Kacines , u-boot@lists.denx.de Subject: [PATCH] Makefile: Improve generated_defconfig file handling Date: Thu, 7 Mar 2024 21:38:22 -0600 Message-Id: <20240308033822.28727-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Commit 2027e99e61aa ("Makefile: Run defconfig files through the C preprocessor") adds `generated_defconfig' file, but fails to clean that up. It might be useful to have that file around after `make' is done, but it's better to clean that up on `make clean'. Also we probably want to hide it in `git status' list. This patch makes the described changes, and also adds `-P' parameter to the CPP command that produces the `generated_defconfig' to avoid generating linemarkers. Signed-off-by: Sam Protsenko Fixes: 2027e99e61aa ("Makefile: Run defconfig files through the C preprocessor") Acked-by: Andrew Davis --- .gitignore | 1 + Makefile | 1 + scripts/kconfig/Makefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 330148119264..d9a64d742fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ fit-dtb.blob* /spl/ /tpl/ /defconfig +/generated_defconfig # # Generated include files diff --git a/Makefile b/Makefile index a2bc9d590329..6fd0e92c7d5a 100644 --- a/Makefile +++ b/Makefile @@ -2205,6 +2205,7 @@ clean: $(clean-dirs) -o -name modules.builtin -o -name '.tmp_*.o.*' \ -o -name 'dsdt_generated.aml' -o -name 'dsdt_generated.asl.tmp' \ -o -name 'dsdt_generated.c' \ + -o -name 'generated_defconfig' \ -o -name '*.efi' -o -name '*.gcno' -o -name '*.so' \) \ -type f -print | xargs rm -f diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 5ce5845e8247..079add4d5dab 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -93,7 +93,7 @@ endif endif %_defconfig: $(obj)/conf - $(Q)$(CPP) -nostdinc -I $(srctree) -undef -x assembler-with-cpp $(srctree)/arch/$(SRCARCH)/configs/$@ -o generated_defconfig + $(Q)$(CPP) -nostdinc -P -I $(srctree) -undef -x assembler-with-cpp $(srctree)/arch/$(SRCARCH)/configs/$@ -o generated_defconfig $(Q)$< $(silent) --defconfig=generated_defconfig $(Kconfig) # Added for U-Boot (backward compatibility)