From patchwork Mon Jan 30 15:16:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734228 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=jcUSfnRK; 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 4P5C263LGyz23hS for ; Tue, 31 Jan 2023 02:35:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F97085A70; Mon, 30 Jan 2023 16:26:36 +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="jcUSfnRK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6530480F5A; Mon, 30 Jan 2023 16:20: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-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 D6B1F859C9 for ; Mon, 30 Jan 2023 16:19: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=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id w13so1142245ilv.3 for ; Mon, 30 Jan 2023 07:19:33 -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=k4T6Tmo1OrzgGXLAmHdkyopdTPRaBA2L3gbEXRRET2c=; b=jcUSfnRKoJJEhfiTVBhckMqQ/GfiJ45S+q0B639sLIDCjV3j64CSX+zt+I9MtFsJTT G9lfrr+H3gV+UWnkMxKouewwnmvACNgitlaijcnMZdOZtipMf31deiL3XeNuutFCZW6L ++g3U2+7ulz1DW9M6vNAKtfCxe8vLcd/nhdB4= 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=k4T6Tmo1OrzgGXLAmHdkyopdTPRaBA2L3gbEXRRET2c=; b=UlZ+KELMgoTsAccsGPuiO1vFd2rvu9j1GVYLsr1s0+7FiNZ3NOC2zbVX/YVr64kzaL BfFn7oK/aeSIQ3KMCRw3dzT6AvDU3RcDWC5UoZUkjYQHS5hSHGuxzIMf/yWq//MBPGf2 V0ZrTzupuHOmhXGyymGOsOxk2xZ8A8AUGbBZScEO5bnA49I7Yca6KkoIGhuLViocNGl3 ohRaO78U8ZfvCv9DgUAJUzlQGUuWnhlk0VtpLS4JwM4zfdXmoLdvMQbTWpwaVHoZjZgs VP38r4KicQbzNWr8F/M806VvJflHko0gx/o+ZfbVMAy9s10JMsFlbFLjHLNu3wNY4hKY qpbA== X-Gm-Message-State: AFqh2krETFb2hXacuXaU6vQQ2E5+TyXDH0jEtbLNNFK++Of9wkl6BDZt VFCyKVTiwaMbf2KZeTnKs/YfR6OpXF9xxZ57 X-Google-Smtp-Source: AMrXdXsdfgG33gAAfH33MZqcDFHtZ8Kvwj0qY+7FLLoBP/Ls1ESys0nSa6tLoXjjLHDafQzb1rui8A== X-Received: by 2002:a05:6e02:be5:b0:30f:1cc:d14b with SMTP id d5-20020a056e020be500b0030f01ccd14bmr31751374ilu.0.1675091894302; Mon, 30 Jan 2023 07:18:14 -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.18.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 07:18:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt Subject: [PATCH 165/171] Correct SPL uses of VIDEO Date: Mon, 30 Jan 2023 08:16:06 -0700 Message-Id: <20230130151612.212732-166-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 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 converts 2 usages of this option to the non-SPL form, since there is no SPL_VIDEO defined in Kconfig Signed-off-by: Simon Glass --- cmd/cls.c | 2 +- common/fdt_simplefb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cls.c b/cmd/cls.c index 18643ec0243..787c7edbee3 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 71d4c8fde90..282c34fe0b9 100644 --- a/common/fdt_simplefb.c +++ b/common/fdt_simplefb.c @@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if CONFIG_IS_ENABLED(VIDEO) +#if IS_ENABLED(CONFIG_VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { struct fdt_memory mem;