From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C711C6FA82 for ; Sun, 25 Sep 2022 15:10:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2BCEE84DAE; Sun, 25 Sep 2022 17:04:58 +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="ScLuHnrP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8635B84CEB; Sun, 25 Sep 2022 17:04:00 +0200 (CEST) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (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 BC2E484C56 for ; Sun, 25 Sep 2022 17:03:57 +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-io1-xd2e.google.com with SMTP id y141so3432487iof.5 for ; Sun, 25 Sep 2022 08:03:57 -0700 (PDT) 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; bh=n9W9ntNNv05F6PMBwCnhFBNeBvfE5LsBhkygV9Fp1F0=; b=ScLuHnrPqd10pWpX/XXk19Gb7oA3WMZcBXXveAk7zcHSVkft2B8nUllvrIll4myU55 Qd2NVFNxiwlGe+fu4t3Qi4Ffd4wg7acf9eB9lgebNDO9iUIPocBK9HizaE6bVYpv9mCp Iy3ZVwIrlJyNH7bm21fQQdLZoelw+CS91TH1E= 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; bh=n9W9ntNNv05F6PMBwCnhFBNeBvfE5LsBhkygV9Fp1F0=; b=XTDs55iPr5Ee3nvi7Orj3T65gTIiKoW61UqWOnM0ijMMpV3NLXwluBASFGlSaSAGnj cfJ40cH6LxeWTunbNAXsfENjgZcmjpYPu7eiHpmoaMGelcfTx7Sdhn4Xt9SY3LhfVZ2P Blmz8dSxKTuXN8/zbIC5nDSZiuiwKpwpIL90pU51qpBt7kqoExes8PmfYQQoY1oU0zmY 5+LZGwMJ0h+tDlyXwT88vydWQ8jBcyNjwHnIApIk34cxArwaBp7R26bClhHDHpY0A05U zCo+Gij8GTqr/fBEtrd66RPJE+2grzb+lQBarxyRpYm+lNoMxJMtZcs0WAHhngXL5dGU S0qQ== X-Gm-Message-State: ACrzQf2pzP+owFI+mZQm3/iaovi5QZRJb9LnZIT5L+yUjng5eZy0EMT0 D+xC9KM/C8nNVCdb7F1uXKGwHUrDanDfLw== X-Google-Smtp-Source: AMsMyM6O1w785U1mRrhzmb2s6U2afvxx1CUkGHkycHn5qcGt3Uhz+2OH+ZyFBCtxHd9Ydj+On19w/g== X-Received: by 2002:a05:6638:2584:b0:349:edd4:4fed with SMTP id s4-20020a056638258400b00349edd44fedmr9303638jat.26.1664118221118; Sun, 25 Sep 2022 08:03:41 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id u19-20020a926013000000b002f19d9838c6sm5360578ilb.25.2022.09.25.08.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 08:03:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Artem Lapkin , John Keeping Subject: [PATCH 29/45] vbe: Rename vbe_fixup to vbe_request Date: Sun, 25 Sep 2022 09:02:32 -0600 Message-Id: <20220925150248.2524421-30-sjg@chromium.org> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220925150248.2524421-1-sjg@chromium.org> References: <20220925150248.2524421-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 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 The vbe_fixup file handles device tree fixups, but these are called OS requests in VBE. Rename the file to reflect its wider purpose. Signed-off-by: Simon Glass --- boot/Makefile | 2 +- boot/{vbe_fixup.c => vbe_request.c} | 2 +- test/py/tests/test_event_dump.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename boot/{vbe_fixup.c => vbe_request.c} (98%) diff --git a/boot/Makefile b/boot/Makefile index dd45d786f8c..19d628d748a 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -47,5 +47,5 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_LOAD_FIT) += common_fit.o endif -obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_fixup.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE) += vbe.o vbe_request.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_VBE_SIMPLE) += vbe_simple.o diff --git a/boot/vbe_fixup.c b/boot/vbe_request.c similarity index 98% rename from boot/vbe_fixup.c rename to boot/vbe_request.c index 8cdff6972b1..935505dd421 100644 --- a/boot/vbe_fixup.c +++ b/boot/vbe_request.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Verified Boot for Embedded (VBE) device tree fixup functions + * Verified Boot for Embedded (VBE) OS request (device tree fixup) functions * * Copyright 2022 Google LLC * Written by Simon Glass diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py index e63c25df537..46d6384eb3a 100644 --- a/test/py/tests/test_event_dump.py +++ b/test/py/tests/test_event_dump.py @@ -16,7 +16,7 @@ def test_event_dump(u_boot_console): out = util.run_and_log(cons, ['scripts/event_dump.py', sandbox]) expect = '''.*Event type Id Source location -------------------- ------------------------------ ------------------------------ -EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*boot/vbe_fixup.c:.* +EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*boot/vbe_request.c:.* EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*boot/vbe_simple.c:.* EVT_MISC_INIT_F sandbox_misc_init_f .*arch/sandbox/cpu/start.c:''' assert re.match(expect, out, re.MULTILINE) is not None -- 2.37.3.998.g577e59143f-goog