From patchwork Mon Feb 28 19:08:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1599150 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=cDDU0Y5u; 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4K7DYT2hckz9sGX for ; Tue, 1 Mar 2022 21:50:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B7F6D83C9E; Mon, 28 Feb 2022 20:10:32 +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="cDDU0Y5u"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2C0318312A; Mon, 28 Feb 2022 20:09:28 +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.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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 750EE83C27 for ; Mon, 28 Feb 2022 20:09:13 +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-ot1-x329.google.com with SMTP id k9-20020a056830242900b005ad25f8ebfdso10277351ots.7 for ; Mon, 28 Feb 2022 11:09:13 -0800 (PST) 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=TuPPB2FNw8m0gU3u7XkGEglXO6nZEpd6Rx6uyIeeCzU=; b=cDDU0Y5u5XomEGOuMO76O0/59xnWfe03lxBQ4JEPZplJDpfExiHmExiB/rqwG0RQPy p0c0+u+kw7rqDtOcYbidRBxpzaLustHYxH9Qc4pJ3X+tfTGSOSWWEHJ1iZImGBjebAf9 IrWNWb49URqthqeXsankJ3klOXHLuerQxnqwo= 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=TuPPB2FNw8m0gU3u7XkGEglXO6nZEpd6Rx6uyIeeCzU=; b=u0Gu5Zg1z8LfYwEuh9he44M4RGlwJAL5guPTfzA8YGVjR19LJ8LiIerj/g8TDgpuAF cZGITJILTLwVzKAuhBKdqweGZsx8YtSKxGcxKdD9qtJRduT/AnXUNf7NNp2UVYXHGB/O XaAbmgos3h78hQwsX3FYnzH9JJc+VCZPrU+G/0muafWRVCbsd1mp3BJ63QBQ8GSVwRHr EUXt63rKWXAm2UaPBAHS36zXS1F/zjwLgPK2DJoGpMWS03Ep5fp4ktoIQgsmMuXvrHM4 2q/xqYSKafTEif59Vg+KHiSELtm7NpyLDlPFqEx/DxRXHPuWByzdHLDhLWHlLs4Iq5zf +KGA== X-Gm-Message-State: AOAM5300Jv3XREZA8iQMNwTPSW8J+bxqgX+zdLTPEP1mVQFJuNPtmYqr 6E9NYV7bYjTTItU7JaySYq80J9YYVUlxGA== X-Google-Smtp-Source: ABdhPJxAeNcSAR9xIM1scOYp4NaBCpdsEhJ8VNVBvVqRv8xa4f09QIgHKhTmmZ3vphrb9cEzDFazaw== X-Received: by 2002:a05:6830:11c1:b0:5af:1808:c734 with SMTP id v1-20020a05683011c100b005af1808c734mr10034180otq.22.1646075352061; Mon, 28 Feb 2022 11:09:12 -0800 (PST) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id f188-20020a4a58c5000000b0031ccb8272f1sm5290577oob.33.2022.02.28.11.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 11:09:11 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Wolfgang Denk Subject: [PATCH 12/18] disk: Correct the conditions for SPL Date: Mon, 28 Feb 2022 12:08:29 -0700 Message-Id: <20220228190835.1480772-13-sjg@chromium.org> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog In-Reply-To: <20220228190835.1480772-1-sjg@chromium.org> References: <20220228190835.1480772-1-sjg@chromium.org> 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.5 at phobos.denx.de X-Virus-Status: Clean These filesystems may have different settings for SPL and TPL. Use the correct Makefile variable to handle this. Signed-off-by: Simon Glass --- disk/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/disk/Makefile b/disk/Makefile index 6ce5a687b3..83f5af6069 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -6,8 +6,8 @@ #ccflags-y += -DET_DEBUG -DDEBUG obj-$(CONFIG_PARTITIONS) += part.o -obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o -obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o -obj-$(CONFIG_$(SPL_)ISO_PARTITION) += part_iso.o -obj-$(CONFIG_$(SPL_)AMIGA_PARTITION) += part_amiga.o -obj-$(CONFIG_$(SPL_)EFI_PARTITION) += part_efi.o +obj-$(CONFIG_$(SPL_TPL_)MAC_PARTITION) += part_mac.o +obj-$(CONFIG_$(SPL_TPL_)DOS_PARTITION) += part_dos.o +obj-$(CONFIG_$(SPL_TPL_)ISO_PARTITION) += part_iso.o +obj-$(CONFIG_$(SPL_TPL_)AMIGA_PARTITION) += part_amiga.o +obj-$(CONFIG_$(SPL_TPL_)EFI_PARTITION) += part_efi.o