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 CBDFAC4332F for ; Wed, 19 Oct 2022 11:26:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 685AE84F8D; Wed, 19 Oct 2022 13:25:22 +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="A6Pv0QDz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BC43984FDC; Wed, 19 Oct 2022 13:25:03 +0200 (CEST) Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) (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 8C0C684F9D for ; Wed, 19 Oct 2022 13:24:43 +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-xd29.google.com with SMTP id 187so14125216iov.10 for ; Wed, 19 Oct 2022 04:24:43 -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=rU7xuz0xmiIUdZh9L/xkmKAEpmqBjr9jRKTGhWcFMHM=; b=A6Pv0QDz4olbUkQN5gGEHt+ls5DVSu8S/eCNcBkek1h8r85M+We2LlaQLGirvhic/T 9oiz/X2x8C4NVWxDSUoCWqdzaFU1WEVhxrJE9Aqx3Brw6TQdSFFng9kxAlyno7m2QWuB ZL6tzHqTDKBbjX5b/ghR11KMVyhLJ3JKVWpTQ= 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=rU7xuz0xmiIUdZh9L/xkmKAEpmqBjr9jRKTGhWcFMHM=; b=6b+XIBxIljkUif6EDjHErt8BscLPjqDmi2G8vUJ77gjSRq6E8dd5tyx9yyO+rGJGlj AnpitmyjmS8E4yGIGL9ujclKHTuftm18jNvSLYKfU1Qy7oTDdWS3qxlQ7PLICMJHhhzu 4B/4RIEmwkAw35mzha+BAhoKkEacBTFLVkLNZ7eKGFIDBIXc/Z+2et0HRPc+Co8V2CFW KYqBh7B55UZWTXgoIVhjzbEk+tXGjoaqNPBk7E7tkHqPg0Taevf/EKi3gp2bLCJ1aCA3 MCpmNb17YbxQlkzQSlRiVGDrsLyf5i3DyNjf0dDbbMMYV8nMQuICOceUj9fHz3euDCTJ IPGw== X-Gm-Message-State: ACrzQf0ijGF285tyYwTGqBtLMzRSYIuE+De327lvZHuWGSCeuYxAgk7B nWl/NkaJCk5Jx5/AlAVhR0+eas34trzzNQ== X-Google-Smtp-Source: AMsMyM541rWlDL394sq9T52jeOCSKyRiejlQ5f5+Zy8u9yiTy1wQW4okjtiKNTaxD7ycxDidaiq98Q== X-Received: by 2002:a05:6602:15d2:b0:6bc:7aaf:8e1c with SMTP id f18-20020a05660215d200b006bc7aaf8e1cmr5047228iow.14.1666178681149; Wed, 19 Oct 2022 04:24:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:24:40 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , Fabio Estevam , Jaehoon Chung , Marek Vasut , Olaf Mandel , Otavio Salvador , Patrick Delaunay , Stefan Roese , Troy Kisky Subject: [PATCH 04/39] Convert CONFIG_VIDEO_LOGO_MAX_SIZE to Kconfig Date: Wed, 19 Oct 2022 05:23:21 -0600 Message-Id: <20221019112356.1042065-5-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 This converts the following to Kconfig: CONFIG_VIDEO_LOGO_MAX_SIZE Signed-off-by: Simon Glass --- configs/m53menlo_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + drivers/video/Kconfig | 7 ++++++- include/configs/m53menlo.h | 5 ----- include/configs/mx23evk.h | 11 ----------- include/configs/mx28evk.h | 7 ------- include/configs/nitrogen6x.h | 1 - include/configs/s5pc210_universal.h | 1 - include/configs/trats.h | 3 --- include/configs/trats2.h | 3 --- scripts/config_whitelist.txt | 1 - 20 files changed, 17 insertions(+), 33 deletions(-) diff --git a/configs/m53menlo_defconfig b/configs/m53menlo_defconfig index 5db591a2120..0e9982e7b1a 100644 --- a/configs/m53menlo_defconfig +++ b/configs/m53menlo_defconfig @@ -127,6 +127,7 @@ CONFIG_SPLASHIMAGE_GUARD=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_SPLASH_SOURCE=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x200000 CONFIG_BMP_16BPP=y CONFIG_WATCHDOG_TIMEOUT_MSECS=8000 CONFIG_IMX_WATCHDOG=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 8ccf6b76a5f..33e1a520876 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -93,5 +93,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index ad3ad70a9d5..badb17d9480 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -98,5 +98,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 4c92f6fd529..0d95ae39608 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -98,5 +98,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 14b80c0f2d3..3ec65d42f52 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -101,5 +101,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index 90566f11926..ecb38fa8045 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -101,5 +101,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 59753b68f23..d211cdfc0af 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -98,5 +98,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 2a21a207129..f155a6770e2 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -98,5 +98,6 @@ CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y CONFIG_VIDEO_BMP_GZIP=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x600000 CONFIG_VIDEO_BMP_RLE8=y CONFIG_BMP_16BPP=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index c2e1b67ce6f..9443be7dfa9 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -62,3 +62,4 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236 diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index c86c3975ff4..a4417560b1c 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -65,4 +65,5 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236 CONFIG_LIB_HW_RAND=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 9bded4cb57f..76e2c2644e2 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -62,4 +62,5 @@ CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DWC2_OTG_PHY=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +CONFIG_VIDEO_LOGO_MAX_SIZE=0x4e236 CONFIG_LIB_HW_RAND=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index a4c9bc62daa..02220399cb4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -919,7 +919,12 @@ config VIDEO_BMP_GZIP splashscreen support or the bmp command. config VIDEO_LOGO_MAX_SIZE - bool "Maximum size of the bitmap logo in bytes" + hex "Maximum size of the bitmap logo in bytes" + default 0x100000 + help + Sets the maximum uncompressed size of the logo. This is needed when + decompressing a BMP file using the gzip algorithm, since it cannot + read the size from the bitmap header. config VIDEO_BMP_RLE8 bool "Run length encoded BMP image (RLE8) support" diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 139919f391e..03e1619c869 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -78,11 +78,6 @@ #define CONFIG_MXC_USB_FLAGS 0 #endif -/* - * LCD - */ -#define CONFIG_VIDEO_LOGO_MAX_SIZE (2 << 20) - /* LVDS display */ #define CONFIG_SYS_LDB_CLOCK 33260000 #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index 69d4552546f..4c0531212ed 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -15,17 +15,6 @@ #define PHYS_SDRAM_1_SIZE 0x08000000 /* Max 128 MB RAM */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 -/* Environment */ - -/* Environment is in MMC */ - -/* USB */ - -/* Framebuffer support */ -#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_LOGO_MAX_SIZE (512 << 10) -#endif - /* Extra Environments */ #define CONFIG_EXTRA_ENV_SETTINGS \ "update_sd_firmware_filename=u-boot.sd\0" \ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 6c2fcbf7645..140f5e98c52 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -22,13 +22,6 @@ #define CONFIG_RTC_MXS #endif -/* USB */ - -/* Framebuffer support */ -#ifdef CONFIG_DM_VIDEO -#define CONFIG_VIDEO_LOGO_MAX_SIZE (512 << 10) -#endif - /* Extra Environment */ #define CONFIG_EXTRA_ENV_SETTINGS \ "ubifs_file=filesystem.ubifs\0" \ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 92c8198cc4b..5c3139b9f6a 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -27,7 +27,6 @@ #define CONFIG_MXC_USB_FLAGS 0 /* Framebuffer and LCD */ -#define CONFIG_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 585c67b7912..a2b62f5f6de 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -121,6 +121,5 @@ int universal_spi_read(void); * LCD Settings */ #define CONFIG_LD9040 -#define CONFIG_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) #endif /* __CONFIG_H */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 973d15962cd..daa8cc79b2f 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -147,7 +147,4 @@ /* LCD console */ #define LCD_BPP LCD_COLOR16 -/* LCD */ -#define CONFIG_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) - #endif /* __CONFIG_H */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 24afc220226..052045a6014 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -137,7 +137,4 @@ /* LCD console */ #define LCD_BPP LCD_COLOR16 -/* LCD */ -#define CONFIG_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54) - #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 31ecb3fe602..4ef98b9c75d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1351,7 +1351,6 @@ CONFIG_USB_TTY CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM -CONFIG_VIDEO_LOGO_MAX_SIZE CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE -- 2.38.0.413.g74048e4d9e-goog