From patchwork Mon Jun 18 14:08:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 930913 X-Patchwork-Delegate: agraf@suse.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 418YCJ5bKXz9s2t for ; Tue, 19 Jun 2018 00:20:12 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5AE61C21E38; Mon, 18 Jun 2018 14:11:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 691C1C21EA2; Mon, 18 Jun 2018 14:10:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B2C82C21EA1; Mon, 18 Jun 2018 14:09:30 +0000 (UTC) Received: from mail-qk0-f202.google.com (mail-qk0-f202.google.com [209.85.220.202]) by lists.denx.de (Postfix) with ESMTPS id 34A44C21E36 for ; Mon, 18 Jun 2018 14:09:27 +0000 (UTC) Received: by mail-qk0-f202.google.com with SMTP id f207-v6so14455335qke.22 for ; Mon, 18 Jun 2018 07:09:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=IH+zjquYJBgCbyZDnHrYdNY8NjteiU261yR8eOXkx1g=; b=CDCxaoR/rE/QvzM6J6bVb+Zky642Jfltj0bkFBNP+HwtmgGh2bQLP/zGoW+hpxEHvD /zJSsUmkG6eZW3trS4QXSQinaxQUphp/fGUv/fCD05i6/7rRoAr79hWWrb+jXunnAj4j RwDokTQdAxeRY9TCS5H6oBnnT4srWhi17r9GEVfEjdjEWNve1s/RfKNfp7Ob4DY/V+Sv fvoP2AXNz58BnkZNIwZLnI98TYORllbM+JX7ZQFuEDNZsjFIctRZQRqhWtFWJ7JrIqAy XuB37pDGxOybCBaWN1jGIIl6p9EgoMdCpoTMVkM9qga7Bdl0O4u+w3ZC1l5+YD2iCS5x 9KFw== X-Gm-Message-State: APt69E0VtPyfNgHnjbSBKLfptNmXx9kXRt57/7UdVgzMl5DFrZ4Y5Kal 40CoOZSWB02oc1NWz+015k62y0g= X-Google-Smtp-Source: ADUXVKLjtUO0nU505dxM6d/efGX5R3P1i8oVejsZjvrwknHKmTkx7CgN5xuIdi6kN5q3FON9Vi9EXDU= MIME-Version: 1.0 X-Received: by 2002:a0c:d2a2:: with SMTP id q31-v6mr6807704qvh.45.1529330966349; Mon, 18 Jun 2018 07:09:26 -0700 (PDT) Date: Mon, 18 Jun 2018 08:08:21 -0600 In-Reply-To: <20180618140835.195901-1-sjg@chromium.org> Message-Id: <20180618140835.195901-17-sjg@chromium.org> References: <20180618140835.195901-1-sjg@chromium.org> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog From: Simon Glass To: U-Boot Mailing List Cc: Andy Shevchenko , Heinrich Schuchardt , Alexander Graf Subject: [U-Boot] [PATCH v8 16/30] efi_selftest: Clean up a few comments and messages X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Fix the 'amp' typo, expand on what 'steps' is and fix a few other minor things. Signed-off-by: Simon Glass --- Changes in v8: None Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None lib/efi_selftest/efi_selftest.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c index 13eb2cd604..dd338db687 100644 --- a/lib/efi_selftest/efi_selftest.c +++ b/lib/efi_selftest/efi_selftest.c @@ -8,9 +8,7 @@ #include #include -/* - * Constants for test step bitmap - */ +/* Constants for test step bitmap */ #define EFI_ST_SETUP 1 #define EFI_ST_EXECUTE 2 #define EFI_ST_TEARDOWN 4 @@ -26,7 +24,7 @@ static u16 reset_message[] = L"Selftest completed"; * * The size of the memory map is determined. * Pool memory is allocated to copy the memory map. - * The memory amp is copied and the map key is obtained. + * The memory map is copied and the map key is obtained. * The map key is used to exit the boot services. */ void efi_st_exit_boot_services(void) @@ -146,7 +144,7 @@ static int teardown(struct efi_unit_test *test, unsigned int *failures) * Check that a test exists. * * @testname: name of the test - * @return: test + * @return: test, or NULL if not found */ static struct efi_unit_test *find_test(const u16 *testname) { @@ -182,7 +180,7 @@ static void list_all_tests(void) * * @testname name of a single selected test or NULL * @phase test phase - * @steps steps to execute + * @steps steps to execute (mask with bits from EFI_ST_...) * failures returns EFI_ST_SUCCESS if all test steps succeeded */ void efi_st_do_tests(const u16 *testname, unsigned int phase, @@ -296,12 +294,12 @@ efi_status_t EFIAPI efi_selftest(efi_handle_t image_handle, efi_st_printc(EFI_WHITE, "\nSummary: %u failures\n\n", failures); /* Reset system */ - efi_st_printf("Preparing for reset. Press any key.\n"); + efi_st_printf("Preparing for reset. Press any key...\n"); efi_st_get_key(); runtime->reset_system(EFI_RESET_WARM, EFI_NOT_READY, sizeof(reset_message), reset_message); efi_st_printf("\n"); - efi_st_error("Reset failed.\n"); + efi_st_error("Reset failed\n"); return EFI_UNSUPPORTED; }