From patchwork Sun Feb 2 13:02:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Rossi X-Patchwork-Id: 1232378 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.a=rsa-sha256 header.s=google header.b=kolWfvq7; dkim-atps=neutral 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) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 489WN25Tqrz9s3x for ; Mon, 3 Feb 2020 00:02:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B3A55817B5; Sun, 2 Feb 2020 14:02:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nathanrossi.com header.i=@nathanrossi.com header.b="kolWfvq7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6970817B6; Sun, 2 Feb 2020 14:02:45 +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=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) (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 E879C8019A for ; Sun, 2 Feb 2020 14:02:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nathanrossi.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=nathan@nathanrossi.com Received: by mail-pj1-x1043.google.com with SMTP id e9so5156585pjr.4 for ; Sun, 02 Feb 2020 05:02:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi.com; s=google; h=date:message-id:from:to:cc:subject:content-transfer-encoding :mime-version; bh=6+zbhyhJ7W/aVgY76Uagkw5dsmel/RIwvmVAwL3mfMY=; b=kolWfvq7VEl8rmxTUy/tq5M/RmjO29ugwRbzdiVEZMAPA/HjzgkG++Z5FY5qr5UMM6 iFB/MWPa6EJXNej8w2unWDTHkA8f+1gCkmMH079sctlWVA5hqxChtb66LCN5MadV1vil WWBD2et//B7oh6ygfetMJ7KDowmUZ8BEoTemPzOfRb4EApgvsiUzoT2/Qx7Aq2GRKaqg 93w9uTuRaLdEPrp4qgW6P4MULDzLHJ6aNNloTASxBaI2I6ZJiwm2kJ5SkRFRWsTzT2XV d1zjt/+QB992J1cMq9MqS39j4bych/32hyl7trJ1Uz2TG26Bnqf2unUi75vkPJFLGg3X cO0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:from:to:cc:subject :content-transfer-encoding:mime-version; bh=6+zbhyhJ7W/aVgY76Uagkw5dsmel/RIwvmVAwL3mfMY=; b=Y15ADJSckqKg5jd8bUQrblFGKqnY5QHK+quvWtDv0vD0Jc38aCHakT/31AtvuQf14V +zv0uaU+EphT7Yoq/GeGLSU5TPPAor7rMmWaZhakDxUtR5W1rAbGIbVGOeVGOr0ag5hD s5O/yJVUOQkCLqiUj4oH8e6LNnlALqnN1o5Ddm/8f0MYpsk01jrsVI3BPC9bS2+u7VGk d0ToeyhqwdaLB4ohUE76kZ4aXWqHF8ViCBkffRuhbqVAx9osXqmcBwJV54Xo5sV2r51M bh9rVtiH938Ruq7VyRaABuFM+RCgOAoTJFTLM/PhTnOzTWDSIOoW5JpC0WsgHC6V45Py zaeA== X-Gm-Message-State: APjAAAUtCEbDPmMzakLdOeXLsEuk3fyptJ3OomSenBaIDLEs5Nfk4KBQ icImGcwGBsfl26Q/R6NsonlHpQ== X-Google-Smtp-Source: APXvYqxqYOzBGrwgGLQONyww4auCg343lMz8SXELNFmbVZXXK6mJG+VqohIFyDwndigP5jnd2c0tTQ== X-Received: by 2002:a17:902:9a82:: with SMTP id w2mr8018661plp.117.1580648560971; Sun, 02 Feb 2020 05:02:40 -0800 (PST) Received: from [127.0.1.1] ([101.184.13.211]) by smtp.gmail.com with UTF8SMTPSA id f127sm16903460pfa.112.2020.02.02.05.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2020 05:02:40 -0800 (PST) Date: Sun, 02 Feb 2020 13:02:27 +0000 Message-Id: <20200202130227.7755-1-nathan@nathanrossi.com> From: Nathan Rossi To: u-boot@lists.denx.de Subject: [PATCH v2] cmd: Handle CONFIG_(SPL_|TPL_)ENV_SUPPORT for toggling nvedit object MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Rini Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean When CONFIG_SPL_ENV_SUPPORT is disabled, nvedit was still being included as part of the build. Use the CONFIG_ENV_SUPPORT, CONFIG_SPL_ENV_SUPPORT or CONFIG_TPL_ENV_SUPPORT values to enable/disable the inclusion of nvedit. Signed-off-by: Nathan Rossi --- Changes in v2: * Changed $(SPL_) to $(SPL_TPL_) to cover CONFIG_TPL_ENV_SUPPORT --- cmd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 2.24.1 diff --git a/cmd/Makefile b/cmd/Makefile index 4f29b72c69..21b867d3a9 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -186,7 +186,7 @@ endif # !CONFIG_SPL_BUILD obj-$(CONFIG_$(SPL_)CMD_TLV_EEPROM) += tlv_eeprom.o # core command -obj-y += nvedit.o +obj-$(CONFIG_$(SPL_TPL_)ENV_SUPPORT) += nvedit.o obj-$(CONFIG_TI_COMMON_CMD_OPTIONS) += ti/