Message ID | 20210917161741.1275871-16-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@ozlabs.org Authentication-Results: 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=YKoxF7pK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4H9zjX0HC2z9sW4 for <incoming@patchwork.ozlabs.org>; Sat, 18 Sep 2021 02:21:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 12E19832D0; Fri, 17 Sep 2021 18:20:13 +0200 (CEST) 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="YKoxF7pK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C856183224; Fri, 17 Sep 2021 18:18:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.5 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-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) (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 873E383267 for <u-boot@lists.denx.de>; Fri, 17 Sep 2021 18:18:06 +0200 (CEST) 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-wr1-x42c.google.com with SMTP id t8so16059803wrq.4 for <u-boot@lists.denx.de>; Fri, 17 Sep 2021 09:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fJf+l6HUiT4fQvC2dhbnrNmfsF1EX4UTmQGKzvbUwfo=; b=YKoxF7pKJbP1XnoimuOKV1ueWfuXOCNoKoLe9im1JmyBDFMQm5JnT4HlQD9eSlg6nb 6woBvYAswEc3P1rR67ssKEQ6AjmbD+etcJOh0nt8HmBoOhMkyUK47pOJwve6DFv9TrqN Ce/0IK4GleTty8IW4fARqo4xcZtbEntSrTDVE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fJf+l6HUiT4fQvC2dhbnrNmfsF1EX4UTmQGKzvbUwfo=; b=e1oPeqxBpUg0qsPxiOPNWbZoMrN3WhNEDVuMhAtlUnNqDqYresmqKLA2H23DFF5uqV tmR3x5234hUCNnZiVuiGL7B8HkQfrRy8Laplh+kNv3OsjIkZFda9u7lOdiqtMoHXnGiN z+TSR5iF6cae1dqgVxHXXnrqvjWxLChr9ilvtQknrhqle1+XqPUFCZ12eLyFLifnPBK7 vwk1gyz5pEfkTMaSMBSWNqi8moczlDko3NW8rXjFUiC5pTru6MKbTNeoIyfczNAxz+AF pQRZtKU2Vpr//FleuZyLfvEXuLDdxV3HCveEA/zSOUeK96ybBFZqhvDGZPMPqb4aGSil dOHw== X-Gm-Message-State: AOAM533xUd155riILucGWELxHtCkXoJ/qXusg4Rg2ieRoKsE8w7q6imt 8g3ItZLwEQ1sfcgmkCNTw4SA13d/MxE6bfmx X-Google-Smtp-Source: ABdhPJzS9XdQvqo7jHAAtKdsQFRGpqC73XUgyAHRdGxpOgQHhr5T5nXf/RgHf3930ZRrT3dc+/DRKQ== X-Received: by 2002:a05:6000:181:: with SMTP id p1mr13418903wrx.247.1631895485574; Fri, 17 Sep 2021 09:18:05 -0700 (PDT) Received: from sjg1.COMFAST (host-92-2-168-81.as13285.net. [92.2.168.81]) by smtp.gmail.com with ESMTPSA id 48sm7699906wrc.14.2021.09.17.09.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 09:18:04 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Masahiro Yamada <yamada.masahiro@socionext.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH 15/17] Makefile: Support ad-hoc COMFIX_SPL_IMAGE_SIZE et al Date: Fri, 17 Sep 2021 10:17:38 -0600 Message-Id: <20210917161741.1275871-16-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog In-Reply-To: <20210917161741.1275871-1-sjg@chromium.org> References: <20210917161741.1275871-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
RFC: Split configs between U-Boot proper and SPL builds
|
expand
|
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index a6705efcf07..8baf8478f64 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -198,11 +198,11 @@ LDPPFLAGS += \ # Turn various CONFIG symbols into IMAGE symbols for easy reuse of # the scripts between SPL and TPL. -ifneq ($(CONFIG_$(SPL_TPL_)MAX_SIZE),) -LDPPFLAGS += -DIMAGE_MAX_SIZE=$(CONFIG_$(SPL_TPL_)MAX_SIZE) +ifneq ($(CONFIG_$(xSPL_TPL_)MAX_SIZE),) +LDPPFLAGS += -DIMAGE_MAX_SIZE=$(CONFIG_$(xSPL_TPL_)MAX_SIZE) endif -ifneq ($(CONFIG_$(SPL_TPL_)TEXT_BASE),) -LDPPFLAGS += -DIMAGE_TEXT_BASE=$(CONFIG_$(SPL_TPL_)TEXT_BASE) +ifneq ($(CONFIG_$(xSPL_TPL_)TEXT_BASE),) +LDPPFLAGS += -DIMAGE_TEXT_BASE=$(CONFIG_$(xSPL_TPL_)TEXT_BASE) endif MKIMAGEOUTPUT ?= /dev/null
Ad-hoc CONFIGs are not supported by the new split-config mechanism. Use the provided work-around for these symbols, just to show the mechanism. Signed-off-by: Simon Glass <sjg@chromium.org> --- scripts/Makefile.spl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)