From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5ACCFC636CC for ; Tue, 31 Jan 2023 15:31:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E2C7585B27; Tue, 31 Jan 2023 16:29:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="T912EjXL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B026685AF2; Tue, 31 Jan 2023 16:28:23 +0100 (CET) Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) (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 7B75285AE6 for ; Tue, 31 Jan 2023 16:27:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12e.google.com with SMTP id i6so2753639ilq.8 for ; Tue, 31 Jan 2023 07:27:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9YEOh+weubu4PugQMTmVQR+jK3CN+XiFXBwsbmo89+M=; b=T912EjXL+t+A+Xuzv6bYn9ZhTyUjhp0Go2kjP6CMeu9FOUHkl57Lkwjlpsqr28zxBI /q9nQ+GmXA2Y/9hYgGyyNXAmlpo9h39aB7NlnrirXA8TbomvoniYS0L7YroayETcOCiU cqcZabRkk0JpBJkq2j/B1GCrBRvDOZrNct++s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9YEOh+weubu4PugQMTmVQR+jK3CN+XiFXBwsbmo89+M=; b=sLSiROLS0lEsb4fqhr/rcCxBI93zzKEG1IAVc7JVoJMIVwn1XAxzEHhogd4gJcZpTu jBTYm1LPPm3R4B81kKO7awM9L4ZdPB17/jrZ7bvzQ1xc/sySzP3eG/F5vlxLkV2b6eIq K7Cq2WGJA/YcyB67/7ZOrx6H56t+DyXcQgjBCum1/qqb7D9LvXxCiq02v6zFlsyC5Rod zkGORkchSy94aPIn9zVp3N71Uyvd002eFP28+8qx/zNUuicBApE+tdUJwlPqma73XuAP Bk/8/qhUPqYlwTFgf66Z9jhorz02IiBS234lnjvmSKIolJbvynh0Jj/jN3vxQqjrQ2G5 Uy2A== X-Gm-Message-State: AO0yUKXJinFsqCejXTqHU8rSPf5e6Xr2t9xUnEm3zuwDQQ50+uhtY/G2 vTy+oxMoFvMDMRNAksFQwvGSsBw2jH965QP2 X-Google-Smtp-Source: AK7set/e7UcBn3Lr+xnla/ktjpNQWD8xdBz6Oq5VH+wRZJxXZew7BwiVoFV7FoMxvFKPSsX7zrpBlA== X-Received: by 2002:a05:6e02:1a42:b0:310:e798:aa2d with SMTP id u2-20020a056e021a4200b00310e798aa2dmr8444399ilv.13.1675178877940; Tue, 31 Jan 2023 07:27:57 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id u4-20020a02cb84000000b0039db6cffcbasm5649328jap.71.2023.01.31.07.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 07:27:57 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Masahiro Yamada Subject: [PATCH 24/32] Makefile: Use empty SPL_ and SPL_TPL_ vars Date: Tue, 31 Jan 2023 08:26:54 -0700 Message-Id: <20230131152702.249197-25-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230131152702.249197-1-sjg@chromium.org> References: <20230131152702.249197-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.6 at phobos.denx.de X-Virus-Status: Clean Now that we include an auto.conf file specific to the phase being built we can make these variables empty. With this done, we can also remove them from U-Boot entirely, dropping them from all Makefiles. That is left for a future clean-up since we cannot apply this series until CONFIG migration is complete. Signed-off-by: Simon Glass --- scripts/Kbuild.include | 15 ++------------- scripts/Makefile.spl | 19 +++---------------- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 62e0207f91b..b7668694101 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -320,18 +320,7 @@ endif # do not delete intermediate files automatically .SECONDARY: -ifdef CONFIG_SPL_BUILD -SPL_ := SPL_ -ifeq ($(CONFIG_VPL_BUILD),y) -SPL_TPL_ := VPL_ -else -ifeq ($(CONFIG_TPL_BUILD),y) -SPL_TPL_ := TPL_ -else -SPL_TPL_ := SPL_ -endif -endif -else +# The SPL_ and SPL_TPL_ vars resolve to nothing so they can be used in +# Makefiles SPL_ := SPL_TPL_ := -endif diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 41528f32307..3009a8b0d4b 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -35,11 +35,9 @@ UBOOTINCLUDE := -I$(obj)/include $(UBOOTINCLUDE) KBUILD_CPPFLAGS += -DCONFIG_SPL_BUILD ifeq ($(CONFIG_TPL_BUILD),y) KBUILD_CPPFLAGS += -DCONFIG_TPL_BUILD -else -ifeq ($(CONFIG_VPL_BUILD),y) +else ifeq ($(CONFIG_VPL_BUILD),y) KBUILD_CPPFLAGS += -DCONFIG_VPL_BUILD endif -endif ifeq ($(CONFIG_VPL_BUILD),y) SPL_BIN := u-boot-vpl @@ -56,21 +54,10 @@ endif export SPL_NAME -ifdef CONFIG_SPL_BUILD -SPL_ := SPL_ -ifeq ($(CONFIG_VPL_BUILD),y) -SPL_TPL_ := VPL_ -else -ifeq ($(CONFIG_TPL_BUILD),y) -SPL_TPL_ := TPL_ -else -SPL_TPL_ := SPL_ -endif -endif -else +# The SPL_ and SPL_TPL_ vars resolve to nothing so they can be used in +# Makefiles SPL_ := SPL_TPL_ := -endif ifeq ($(obj)$(CONFIG_SUPPORT_SPL),spl) $(error You cannot build SPL without enabling CONFIG_SUPPORT_SPL) -- 2.39.1.456.gfc5497dd1b-goog