From patchwork Sun Feb 19 23:44:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1744773 Return-Path: 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=YNtpOQy5; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PKhzb2dWVz23yV for ; Mon, 20 Feb 2023 10:47:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A6BC5858D6; Mon, 20 Feb 2023 00:46: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="YNtpOQy5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 74C288592B; Mon, 20 Feb 2023 00:46:17 +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-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 E7D488590D for ; Mon, 20 Feb 2023 00:46:08 +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-x136.google.com with SMTP id m18so554344ild.0 for ; Sun, 19 Feb 2023 15:46:08 -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=XgwAt8ebPcSO4/d0kVX+a3iFEDd+fXENY/HuE2ei0o4=; b=YNtpOQy5GnB0rwMNQ3B3uo5JmP/4IaNes8A/gduAdBh05fw1bEeOsTFUCR3FZhhX2F nNRpxShP0WqYX2YVa7IzpuHVecszn8B+oqhdPXEIoknwbPaHw28ypQ/Ol8cXnGggzzng N9vPJlcTjE8wupvnLPT4eHl2EdQT/9jLexT2M= 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=XgwAt8ebPcSO4/d0kVX+a3iFEDd+fXENY/HuE2ei0o4=; b=hYWeJ2RoYdNwHIdckyfMwcDdJ3p8V+zEnqy7C8p+99U+BmpP9Oae9QvAqHiSlAzedL 1dO05xcykuVn1V1oQBRqKVTZL9c6QX4KGBk0M3n1TUYnJ/SIrXHWTCW+/wY67euGkluJ 4MYR8B8ASDYIsNB69efQpAcjOKWR5jPaqum7K4zEltFUqOyk7NXq8m1YVAux42+281pJ UBVGCaIyORqfe4qFzjo9vnWGmzzXNRxU53hAv1cvxPOzR0Nkzr6g2JWxARQLVeoxUDGr PVBRoD7Hi0KKQjRofK/FblWTmpKSd9Goeh9dQLqkeRljA6FXetEuuK0jan4CMVsOvlI9 NRCw== X-Gm-Message-State: AO0yUKUdNf5iw5Oa97pe5eCICskHXvgVEX55l1rvxQS42fvBes26Ib/g e1ff5sMJtDItMld9g5COnb289/m3iKwcxdz5 X-Google-Smtp-Source: AK7set9zrbXfrzSAZGplDX78RV4LOGr/cAj+A4LM0cJCXHXlLs9k8ZI1XYizr8y+NgLaXfMbP3iqjQ== X-Received: by 2002:a05:6e02:1cae:b0:315:2b7b:a3b7 with SMTP id x14-20020a056e021cae00b003152b7ba3b7mr1140652ill.5.1676850367551; Sun, 19 Feb 2023 15:46:07 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id n23-20020a02a917000000b0037477c3d04asm3485333jam.130.2023.02.19.15.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Feb 2023 15:46:07 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v4 05/46] bootstd: Disable QFW bootmeth in SPL Date: Sun, 19 Feb 2023 16:44:46 -0700 Message-Id: <20230219234527.1849470-6-sjg@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230219234527.1849470-1-sjg@chromium.org> References: <20230219234527.1849470-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.6 at phobos.denx.de X-Virus-Status: Clean Move this Makefile line into the non-SPL area so we don't have to reply on the SPL_TPL_ macro. Signed-off-by: Simon Glass --- (no changes since v3) Changes in v3: - Add new patch to disable QFW bootmeth in SPL boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/Makefile b/boot/Makefile index 5424b6fafcc..b9a12236798 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o obj-$(CONFIG_PXE_UTILS) += pxe_utils.o +obj-$(CONFIG_QFW) += bootmeth_qfw.o endif @@ -26,7 +27,6 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_DISTRO) += bootmeth_distro.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_DISTRO_PXE) += bootmeth_pxe.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o -obj-$(CONFIG_$(SPL_TPL_)QFW) += bootmeth_qfw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL