Message ID | 20230206190550.1692420-71-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=Y+d1IbNq; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P9bkj5WP0z23r8 for <incoming@patchwork.ozlabs.org>; Tue, 7 Feb 2023 06:22:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2DDDA86140; Mon, 6 Feb 2023 20:13:51 +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="Y+d1IbNq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4405F85C9E; Mon, 6 Feb 2023 20:10:47 +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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 B756A85C83 for <u-boot@lists.denx.de>; Mon, 6 Feb 2023 20:10:10 +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-x12c.google.com with SMTP id w2so1401544ilg.8 for <u-boot@lists.denx.de>; Mon, 06 Feb 2023 11:10:10 -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=PMOKN+h8WYDoNu9NZmz2DrTEvd8adcNaE4nOAoZtPfA=; b=Y+d1IbNqPxzXo7ioIGCbaNulMz+Qz/BZ/ELRNp6RIVV9xLbdxSJaAekhbYu4wULzOZ yE7ZT19S07jzUdEkXnYAlVF9X+BixPIkBZyJRQvXfnKxhBrG5nPHIaVLOqIEcw0I/L6v eJzSq8X7dbkspfUpMZRHZX85/CVHCIyLzvy+E= 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=PMOKN+h8WYDoNu9NZmz2DrTEvd8adcNaE4nOAoZtPfA=; b=gIXMBPEzB6lwP6uLd6nHUsqBG8y4wJ4xRK2e811efouZYitoKXCL8ZFiyxkOr9+P/I 1vTO5sNQzzFukrsmjpPvQ1vNXdpTlMh9iqesUxn1i0OZ5rKvT0wiTF1KrBdSV/u5a24t 89e8wncjdG/9bsQoVGcBuHHEUjJvVULCVFztuuM9TfQvEArzT4FVvJc7Hvm6Rm4hHJmC 8NDarxG1FBX7RCuj8boVgTvI6ZEf147O9UDj7+ZMz7jEm2jHYw2Ud/y/cYaaz2V8e5gU bwpi5UWoMMztfQlpLsYL6bWDY8nYGRC/AoBN0ABbQuFn5SHQKV4aBgnq9wcsee8w9ec4 Izkg== X-Gm-Message-State: AO0yUKXDvkXy8oS+TgGm/KCznYXdKe8nxju1fJCcaOWc4dbauw7leQiB q7D7mKIczhfOZEpSYuAeuKokDhStqlavuB5x X-Google-Smtp-Source: AK7set/aIAN4C7ZKiQBdGcjK4s6HtwIZmGXLG5AA09eVztcdFj/TQJv1AnO+QoKbHn7LcCNXr9jHrA== X-Received: by 2002:a05:6e02:1bab:b0:313:c28d:daf with SMTP id n11-20020a056e021bab00b00313c28d0dafmr222919ili.32.1675710587091; Mon, 06 Feb 2023 11:09:47 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:34e9:6977:1cac:fd32]) by smtp.gmail.com with ESMTPSA id t24-20020a028798000000b00375a885f908sm749878jai.36.2023.02.06.11.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:09:46 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org>, Masahiro Yamada <yamada.masahiro@socionext.com> Subject: [PATCH v3 70/81] Makefile: Use empty SPL_ and SPL_TPL_ vars Date: Mon, 6 Feb 2023 12:05:38 -0700 Message-Id: <20230206190550.1692420-71-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206190550.1692420-1-sjg@chromium.org> References: <20230206190550.1692420-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Migrate to split config
|
expand
|
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)
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 <sjg@chromium.org> --- (no changes since v1) scripts/Kbuild.include | 15 ++------------- scripts/Makefile.spl | 19 +++---------------- 2 files changed, 5 insertions(+), 29 deletions(-)