Message ID | 20230204002619.938387-24-sjg@chromium.org |
---|---|
State | RFC |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=HHJcbk0z; 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 4P7v0y59wLz23hh for <incoming@patchwork.ozlabs.org>; Sat, 4 Feb 2023 11:44:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2FA4C860A3; Sat, 4 Feb 2023 01:42:19 +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="HHJcbk0z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2DD7C85740; Sat, 4 Feb 2023 01:41:29 +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-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 F11BA85FFB for <u-boot@lists.denx.de>; Sat, 4 Feb 2023 01:28:17 +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-x130.google.com with SMTP id k17so21138ilq.12 for <u-boot@lists.denx.de>; Fri, 03 Feb 2023 16:28:17 -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=HHJcbk0z6zVjg2zqZtdBAgjIyUyzex2SvhVTeAg9AWqpLDAQTu1Hum4IUKsO5ppgWz 5oeScTUrruHoKNXCMGPEgqMian/cLMw8IpeVKKfuRUiI4JajFFmPnz1orpUG67oJgG8G clcx9ZvtuOfMX0kQuDWsgr9YHbyrkR7oxq/2A= 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=VDtbhn5RlzbMf1FDCJGRxqxEhfPCHe3Ir1ToBuJkVDRHFEngoIADqUARt7kOM6P3rh ui5iOEeIfF9FpVvHy0TriJBrf+BB043XKcAv5A5q2o35vhe/kguXKhap3gnFAQHwOLNA x73JMQ1AdEhjPYryhdcP1sIJg9uhtUXb0X3OaRfGGjePg00zXOniR27WFF8c1kUMcQoq hQCe4ZQOuZw2ZeAECZPfrjP6C5z/2gcnoh7HIjONqorCbaxxJ+SUzidOZtx51S2x3dGf 9ileNgfSNS6LQsx5Ntz6T9EfDcWSKYPvr9KcpoMeGS9lZswnwLMKzxcSfo9TJ0nnOL93 KRzg== X-Gm-Message-State: AO0yUKUA8n38RT2++vpTnKl8D8RLFXVbglaYcYYhsd3Tc9Cmo47Bs/Hi dn1p3uuJD/vNqHbp8ZMDcthwEZorswYW2Hnn X-Google-Smtp-Source: AK7set8399GnKSCFdmYEJG4YCxqgZVPG6Oy+JkdP5/XtHccEmm+LP44R8bmxHIbuVlsoIUlURx0X8w== X-Received: by 2002:a05:6e02:2184:b0:311:478:f282 with SMTP id j4-20020a056e02218400b003110478f282mr11979105ila.26.1675470496703; Fri, 03 Feb 2023 16:28:16 -0800 (PST) Received: from kea.bld.corp.google.com ([2620:15c:183:200:5b65:12f1:51b7:8157]) by smtp.gmail.com with ESMTPSA id j12-20020a02cc6c000000b003adab954c5asm1270255jaq.153.2023.02.03.16.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Feb 2023 16:28:16 -0800 (PST) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Simon Glass <sjg@chromium.org> Subject: [RFC PATCH v2 23/56] test: Tidy up sandbox handling in test-main Date: Fri, 3 Feb 2023 17:25:46 -0700 Message-Id: <20230204002619.938387-24-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230204002619.938387-1-sjg@chromium.org> References: <20230204002619.938387-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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean |
Series |
Migrate to split config
|
expand
|
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; }
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 <sjg@chromium.org> --- (no changes since v1) test/test-main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)