From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1854FC4332F for ; Wed, 19 Oct 2022 11:24:46 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93D2984FA9; Wed, 19 Oct 2022 13:24:44 +0200 (CEST) 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="IEUQncat"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5DDAA84F95; Wed, 19 Oct 2022 13:24:41 +0200 (CEST) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 6438084E7F for ; Wed, 19 Oct 2022 13:24:38 +0200 (CEST) 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-xd32.google.com with SMTP id r142so14126041iod.11 for ; Wed, 19 Oct 2022 04:24:38 -0700 (PDT) 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=RBU02AJ/xreeEqW3I2zGOXKGMrv3Y3VWv4JbSZKh3no=; b=IEUQncatv4q3HqoKQowxfhFwO8KrGVp8qw0Ett4PvKgQ/QAzn3j5f/wh5H8/ydsGWG My0AroMHm0VSnrnFBSLoHs3gPaFZcc7XRJWQ2krKaZj/ywcmcS3Y4rjdCA5vxnez4JLL oe53M1EHdEzj8MrMMBNY8SkQJuZNMvb7vO6o8= 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=RBU02AJ/xreeEqW3I2zGOXKGMrv3Y3VWv4JbSZKh3no=; b=mUX97bRkGD1lTlu0lDBgvysiJDNHdRUwU9MpBajt8G7atq/xWk1R/XrSOpCl45SU2C ieWzBm+V1dlaushvdfsXdU13WX/ur5VrkVQvfUTbeHhjivS5jHMB8PmNqZOzBEBF4GwK Dnfjb1GiJABLw+ls1/EDa5gtRhgxrhWMb3lHOUuffOTaA57g5xw9vMwXw0859Z5y1ldU KFhoHvUiNjs43XpjS6/arR7lJfde42PrJkqgb2N4PiaRu7Bv+vPcxOttq4firEc9G21b 6QxF7rdFAoK8M8Qj54lj0nPbCzd1g7KJQk9kZ6YGVB8sA8JOn+yrTl6EWvt+Vtx1LC11 ndTg== X-Gm-Message-State: ACrzQf1O3yltSKXZ4jUEPXWq8dCzzt/EeHXYIbIjdpbVROknouTt7J33 ZDLXCZC6yIhi3/mWmwqcEqoqD2aXYSc4AA== X-Google-Smtp-Source: AMsMyM4lnb8BFB+HxupyDDMe1t7uebMrymfMciCqCCCvJpGyfEWGuEhr6fgH5iQipd1QCp1vQsz6Rw== X-Received: by 2002:a5e:d502:0:b0:689:72da:ab3f with SMTP id e2-20020a5ed502000000b0068972daab3fmr5133074iom.109.1666178676694; Wed, 19 Oct 2022 04:24:36 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id g34-20020a022722000000b003634aa4a55asm2041156jaa.82.2022.10.19.04.24.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:24:36 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , Jason Liu Subject: [PATCH 01/39] video: Split SPLASH_SCREEN_ALIGN from bmp command Date: Wed, 19 Oct 2022 05:23:18 -0600 Message-Id: <20221019112356.1042065-2-sjg@chromium.org> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog In-Reply-To: <20221019112356.1042065-1-sjg@chromium.org> References: <20221019112356.1042065-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 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 The bmp command already has a way to centre the image. Using this CONFIG option to also centre it makes it impossible to control where images are placed on the screen. Drop the extra check. Simplify the Kconfig file we are here. Signed-off-by: Simon Glass --- cmd/bmp.c | 4 +--- drivers/video/Kconfig | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/bmp.c b/cmd/bmp.c index 45f4c1296de..d72a826ae74 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -259,9 +259,7 @@ int bmp_display(ulong addr, int x, int y) if (!ret) { bool align = false; - if (CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || - x == BMP_ALIGN_CENTER || - y == BMP_ALIGN_CENTER) + if (x == BMP_ALIGN_CENTER || y == BMP_ALIGN_CENTER) align = true; ret = video_bmp_display(dev, addr, x, y, align); diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4ecc158c460..0af94e90706 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -831,9 +831,10 @@ config SPLASH_SCREEN image data before it is processed and sent to the frame buffer by U-Boot. Define your own version to use this feature. +if SPLASH_SCREEN + config SPLASHIMAGE_GUARD bool "Support unaligned BMP images" - depends on SPLASH_SCREEN help If this option is set, then U-Boot will prevent the environment variable "splashimage" from being set to a problematic address @@ -847,7 +848,6 @@ config SPLASHIMAGE_GUARD config SPLASH_SCREEN_ALIGN bool "Allow positioning the splash image anywhere on the display" - depends on SPLASH_SCREEN || CMD_BMP help If this option is set the splash image can be freely positioned on the screen. Environment variable "splashpos" specifies the @@ -869,7 +869,6 @@ config SPLASH_SCREEN_ALIGN config SPLASH_SOURCE bool "Control the source of the splash image" - depends on SPLASH_SCREEN help Use the splash_source.c library. This library provides facilities to declare board specific splash image locations, routines for loading @@ -900,6 +899,8 @@ config SPLASH_SOURCE In case the environment variable "splashfile" is not defined the default name 'splash.bmp' will be used. +endif # SPLASH_SCREEN + config VIDEO_BMP_GZIP bool "Gzip compressed BMP image support" depends on CMD_BMP || SPLASH_SCREEN -- 2.38.0.413.g74048e4d9e-goog