From patchwork Sat Mar 14 23:16:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1990 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1773530275; bh=wP2ZjAO3DpgJbi+y+QEOmYdj+Xh/7tfiSz2JzCxf638=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=sZBcgBzwK0GyGqZN4U+8f3UvkBBj/SNV4rRV/1n6L8+SCOksUITPEMqUx3RWpTmHF GRdCJwpClLfh/VVtXTdtIBQyGcGDTI/b7qplgI+l3ZHYmIG+uxJW32QHajKSqdDVTl Nb4vCzBf+j/zv1sFvm5qJGPjccQ/I/2Yi/GcUHz5oYy0SPtfoQc/9MucOmCHz/VqyU fNaFIwtGAhP7KttEUyHxHxSMqLsaYqWZSQpakpPN8hz9afn5xXbgE4cyzZ/yrf/xwE SVQTfieRBixKgHNNsGj5wPjpB8NnGHsmun2VsGB8XR6ZO+5d7mW3f5nzs0oqKCdKCR 0RkBmPDyBASIw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 8EF8B6A036 for ; Sat, 14 Mar 2026 17:17:55 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id jeguoWLIlaK2 for ; Sat, 14 Mar 2026 17:17:55 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1773530273; bh=wP2ZjAO3DpgJbi+y+QEOmYdj+Xh/7tfiSz2JzCxf638=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=XGPIB7j8zuOrw1NIne9xYGGdYwIOHlovGJxrfZL+VkJIov/08IllJFD5/tyijEPTw BWclP9kL4xExKHReem8IKUPXV0yGBbe4G/8g9G/H8Cy4XtCGJXLEMOYeZdPBYGCXqq +53KlbfXYDgKSZf40Srras9wEE/AYcaucZf81FaLP4o8MOF6Qa3aZ9lxAFUbOQKtAG Y4+eqypdICC3RdIslq8NBXhL5Cms6b6dyWlGE6qNBJqHfWAPP65JgQasOe987TPQ/5 Hx2dBZOuSko8YIHhoQMsJ38Qcf3fAkLwOyEipQPnAZq6/GWveqFwWfkuzfza9fATnn HwAS0Fvy0rL0Q== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id DD7266A033 for ; Sat, 14 Mar 2026 17:17:53 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1773530269; bh=4r6lhAUYdiO5tR4Ly0NnbK2CIbuBRQdkOaK96eHjwx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JhD9oszBf23UjufuudAAkIt2phT8VZYPK8MPn1CAs7sqUBvMQy1l56tvCebyhhHCk jWuir/zaenKpYPvAIL66UilyZ0JNTemYqZQHJ5RhAudz1JcDuREg/klJgcSpxa12LQ AV2hB04Rp0wYECKhaxI02j3btd27y60Lxveo8kftojyAcLGSiXqdUsbVnsDpRLXpCe q2aF7J8FKOZfPMU62CDT6H/C8jbhxHunFuO0UG99PxshAvpOYVxUbss8kmvpviOFBF cvS16hiOC92UUC+haFVa8hI64FaRaYOyWvFxgelygtnlK1kJZakIzheZzIq32IAYbf ov3+URTF2IEJQ== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id C6C736A057; Sat, 14 Mar 2026 17:17:49 -0600 (MDT) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id NgDvHs0dFtRv; Sat, 14 Mar 2026 17:17:49 -0600 (MDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1773530265; bh=SaZ2dNZxAW+3B4lXobSN5iGYNhPAZUuwRGg6/mSyuu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tfbbfLjETddxqxseS0VKFBSLMS6cJn3E8t9M0GpY4NF++tIqWeHRMSSKgNPl0gKMe wEOXWVqd/kQRZJoT1HU87TLG78+3FHYgGfg26fB4icGu99bpovWpnwBVsBS0pGoA9f fTu18f8ocUdbzqqQJbpWhou26iCVy7X+RATeB/ECDhcFiU+7XJQSA2Iyb9up7UAZGS zOu1OptBdTohzYC8HfN+rmGrpOWgsvPDI+5/U6RvwNUjMKwJrekdSZX8OfX600JJEs 9OzZ709UqZSAaEUbzoXBWOVkAtmf5N/JfsJFDD8z9Uf1a5DmcqNuoR92Ol3fsIv66e SsHN7C0H7wJaQ== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 570756A048; Sat, 14 Mar 2026 17:17:45 -0600 (MDT) From: Simon Glass To: U-Boot Concept Date: Sat, 14 Mar 2026 17:16:08 -0600 Message-ID: <20260314231618.338113-18-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260314231618.338113-1-sjg@u-boot.org> References: <20260314231618.338113-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: ILAQTU5YK5ZUUE6DYUILSCUHG2VJSDGW X-Message-ID-Hash: ILAQTU5YK5ZUUE6DYUILSCUHG2VJSDGW X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 17/19] test: boot: Restore default addr env vars in extlinux tests List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass The PXE tests set kernel_addr_r to 0x2000000 and do not restore the original value. When bootflow_extlinux_localboot or bootflow_scan_extlinux run later, they read the wrong address from the environment and fail. Restore kernel_addr_r and ramdisk_addr_r to their default values at the start of each test so they do not depend on test ordering. Signed-off-by: Simon Glass --- test/boot/bootflow.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 9aab3ea807a..53fa88ae080 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -1677,6 +1677,11 @@ static int bootflow_scan_extlinux(struct unit_test_state *uts) const void *fdt; int node; + /* restore default addresses in case PXE tests changed them */ + ut_assertok(env_set("kernel_addr_r", "1000000")); + ut_assertok(env_set("ramdisk_addr_r", "2000000")); + ut_assertok(env_set("fdt_addr_r", "c00000")); + ut_assertok(run_command("bootflow scan", 0)); ut_assert_console_end(); ut_assertok(bootstd_get_priv(&std)); @@ -1745,6 +1750,11 @@ static int bootflow_extlinux_localboot(struct unit_test_state *uts) const char **old_order; struct bootflow *bflow; + /* restore default addresses in case PXE tests changed them */ + ut_assertok(env_set("kernel_addr_r", "1000000")); + ut_assertok(env_set("ramdisk_addr_r", "2000000")); + ut_assertok(env_set("fdt_addr_r", "c00000")); + ut_assertok(prep_mmc_bootdev(uts, "mmc9", false, &old_order)); ut_assertok(run_command("bootflow scan", 0));