Message ID | 20230130151612.212732-143-sjg@chromium.org |
---|---|
State | Changes Requested |
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=85.214.62.61; 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=Ux0s4iHW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5CHb73Qvz23j6 for <incoming@patchwork.ozlabs.org>; Tue, 31 Jan 2023 02:47:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1525F80F62; Mon, 30 Jan 2023 16:47:33 +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="Ux0s4iHW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47953859D8; Mon, 30 Jan 2023 16:25:39 +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-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 2E1148593F for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 16:19:05 +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-x12b.google.com with SMTP id k12so193105ilv.10 for <u-boot@lists.denx.de>; Mon, 30 Jan 2023 07:19:05 -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=U9mj/2XvAj/Vf/bs3Os5UpRWE32VJUGgkMMzyV+OqdA=; b=Ux0s4iHWmi39j822BA9o3xcQPqR5jFJOK/bN1wtAH6mUGPF34ovD5IP6SxJ7a+BVBC 75eYoDAbJ8wHm3ouei5ED9jQ21MqZGTqLwLZ2NHkP2OTqne26dZa0rVPoMKUFQrf+ET2 7yg2p1r2JUo9ncJeh8lxyE8thK+sMGZyJapPw= 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=U9mj/2XvAj/Vf/bs3Os5UpRWE32VJUGgkMMzyV+OqdA=; b=lJG5Rtlxk8EDtMmkikLmI12OuSsALky7XIu02VkelJIkFYwWkKLt/t7uf3Yu8+rusk yiQ8R4iOc1LdXm3AdIMML1NySkxF+cvGAri0bCTyHPcNU4fGYCbo+PX/hWRvmcAA4oxg 5CC2ZQlV+I8dHB1rV6OpkRErOprFtlCIiMwKYdmGd0XCo8c5u/ZB2MDU4tTDytzPh6eO X/zFy6CmNQ4ahk/SduSQwlcPYyYofjBrcwv+MNhSg8etgb7eBD/osaO/Wm4Ur+NkE+XP Z+xYuwgSm6VnCHLuozEsnSz8tsxgmGUtE76rNM3EfrIZr1yfLUyGLOnZCjfOE/ja3tqM GFSg== X-Gm-Message-State: AO0yUKVYQR/P1vA7MBE08MTyGdQ7ooyTMDm8NTKO97538NT1HqtCoD77 rGQigkRGf7Gbdhp5hc2K2B/zytXgXQ4pRJEb X-Google-Smtp-Source: AK7set9vKcJQTAC0GK1irNNJsnTf5QEsGubTcuz5kzFKTvn5YNgG2racSYk+di0za4JlJPUQ9lPG0A== X-Received: by 2002:a05:6e02:178e:b0:310:e24b:a5a6 with SMTP id y14-20020a056e02178e00b00310e24ba5a6mr6084692ilu.9.1675091874439; Mon, 30 Jan 2023 07:17:54 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o13-20020a92d38d000000b00302bb083c2bsm4103194ilo.21.2023.01.30.07.17.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:17:54 -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>, Michael Walle <michael@walle.cc> Subject: [PATCH 142/171] Correct SPL use of SL28_SPL_LOADS_OPTEE_BL32 Date: Mon, 30 Jan 2023 08:15:43 -0700 Message-Id: <20230130151612.212732-143-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130151612.212732-102-sjg@chromium.org> References: <20230130151612.212732-102-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 |
None
|
expand
|
diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 257923685a5..e78a0d5dd3c 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -188,7 +188,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fixup_icid(blob); - if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) { + if (IS_ENABLED(CONFIG_SL28_SPL_LOADS_OPTEE_BL32)) { node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz"); if (node) fdt_set_node_status(blob, node, FDT_STATUS_OKAY);
This converts 1 usage of this option to the non-SPL form, since there is no SPL_SL28_SPL_LOADS_OPTEE_BL32 defined in Kconfig Signed-off-by: Simon Glass <sjg@chromium.org> --- board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)