From patchwork Mon Feb 6 19:05:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1738396 X-Patchwork-Delegate: trini@ti.com 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; 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=nhW5evay; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4P9bfp06QMz23j0 for ; Tue, 7 Feb 2023 06:19:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5209186102; Mon, 6 Feb 2023 20:12:50 +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="nhW5evay"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5307685CBF; Mon, 6 Feb 2023 20:10:16 +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-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) (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 CC64285A51 for ; Mon, 6 Feb 2023 20:09:39 +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-io1-xd34.google.com with SMTP id z21so4844140iol.0 for ; Mon, 06 Feb 2023 11:09:39 -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=AmvcFMjjfpTNPnWTshCRcCLrLZe2s/yyYfF+O7Ik8AM=; b=nhW5evayHfCvPYOxiDPlWVshjbQarQnqJYZwL/9o2QIQ5PrlVyC5+5VwxyrKlQmuLo bi4Wsq86mIFX57wiRnv0h+nGqurxkesOSpZCQ+6xBFENkbS3FWjoTwxbV7k9F4F69q4+ /J1RdcZ9wos+eqbqpeZIu1DcRwvcSo9QxrMK4= 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=AmvcFMjjfpTNPnWTshCRcCLrLZe2s/yyYfF+O7Ik8AM=; b=EJ6bCDl3r8rVs+jUTqJkbM/4wcFkC9S516Tq1w5loTwM/4GZZ2I87KhPOC7w5AiQ2D afC+a9EWVnevqdsAKY5SBH4oLllyHO+2LqX3c6HO2aTS/kQNAO5D1dCIdS+n0Ulqe0ab QKx36q9LGKkEcvNRAHnE3l9dh0cRxbjE2P0Lr80uBRbDXESXQzsAyH0cG1q/99TQZQ84 PtabqCE1uk0ciN/EpNGjFxCaj9167wmpmL7SpNrYEbhPtJrOk2vTS/NgQkFtiTvki7Sv WlTuU+5+3SIZAdRoe0/40AHF2fEH7F2arkQBlHU82YeqQlALrrtHv69sDCBHfTIc357b KRuw== X-Gm-Message-State: AO0yUKVtrYVZEJYuJhdWQ7bcLac854fBq16fwxuVKGJtkdb5hHg719SI Uq+qs52kg/3s+rLnCwBKxH8mZ+X7D/Wke57o X-Google-Smtp-Source: AK7set+gGIBsJ/y2JTb+l+1smFJ9ephr/o/UJ1+pSvC3kiLZA9EouUF/1iWZPgoXhDNyc7hCcDFrcw== X-Received: by 2002:a6b:5a17:0:b0:714:ff62:cb18 with SMTP id o23-20020a6b5a17000000b00714ff62cb18mr457485iob.17.1675710565510; Mon, 06 Feb 2023 11:09:25 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:34e9:6977:1cac:fd32]) by smtp.gmail.com with ESMTPSA id t24-20020a028798000000b00375a885f908sm749878jai.36.2023.02.06.11.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 11:09:25 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v3 45/81] test: Tidy up sandbox handling in test-main Date: Mon, 6 Feb 2023 12:05:13 -0700 Message-Id: <20230206190550.1692420-46-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230206190550.1692420-1-sjg@chromium.org> References: <20230206190550.1692420-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 This is pretty messy at present since it relies on a SPL_SANDBOX option that does not exist. Use the normal options instead, so that it will work with split config. Signed-off-by: Simon Glass --- (no changes since v1) test/test-main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/test-main.c b/test/test-main.c index ea959f4e859..b3c30d92937 100644 --- a/test/test-main.c +++ b/test/test-main.c @@ -46,14 +46,14 @@ enum fdtchk_t { */ static enum fdtchk_t fdt_action(void) { - /* Do a copy for sandbox (but only the U-Boot build, not SPL) */ - if (CONFIG_IS_ENABLED(SANDBOX)) - return FDTCHK_COPY; - /* For sandbox SPL builds, do nothing */ - if (IS_ENABLED(CONFIG_SANDBOX)) + if (IS_ENABLED(CONFIG_SANDBOX) && IS_ENABLED(CONFIG_SPL_BUILD)) return FDTCHK_NONE; + /* Do a copy for sandbox (but only the U-Boot build, not SPL) */ + if (IS_ENABLED(CONFIG_SANDBOX)) + return FDTCHK_COPY; + /* For all other boards, do a checksum */ return FDTCHK_CHECKSUM; }