From patchwork Fri Jun 14 22:54:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Winkler X-Patchwork-Id: 251558 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 149E42C0040 for ; Sat, 15 Jun 2013 08:54:48 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E2A5B4A018; Sat, 15 Jun 2013 00:54:44 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3br1a69ujktP; Sat, 15 Jun 2013 00:54:44 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 614EF4A019; Sat, 15 Jun 2013 00:54:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CBABE4A019 for ; Sat, 15 Jun 2013 00:54:33 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KovJV5mg-Q+U for ; Sat, 15 Jun 2013 00:54:28 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.integraonline.com (relay4.integra.net [204.130.255.183]) by theia.denx.de (Postfix) with SMTP id 0B0E74A018 for ; Sat, 15 Jun 2013 00:54:18 +0200 (CEST) Received: (qmail 22722 invoked from network); 14 Jun 2013 22:54:16 -0000 Received: from unknown (HELO localhost.localdomain) (70.96.116.236) by relay4.integra.net with SMTP; 14 Jun 2013 22:54:16 -0000 From: Robert Winkler To: u-boot@lists.denx.de Date: Fri, 14 Jun 2013 15:54:09 -0700 Message-Id: <1371250449-16329-1-git-send-email-robert.winkler@boundarydevices.com> X-Mailer: git-send-email 1.8.3 Subject: [U-Boot] [PATCH] imx: nitrogen6x: Add splash screen support to nitrogen6x X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Depends on: 18d1c87ebe2a6a05905ae1cdd7a31abe6b5ee39d b38050121cd3fea821a048661cdad5bf71f3a2b8 Signed-off-by: Robert Winkler --- board/boundary/nitrogen6x/nitrogen6x.c | 21 +++++++++++++++++++++ include/configs/nitrogen6x.h | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 8f0f9b8..7096029 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -388,6 +388,27 @@ int board_eth_init(bd_t *bis) return 0; } +int splash_screen_prepare(void) +{ + char *env_loadsplash; + + if (!getenv("splashimage") || !getenv("splashsize")) + return 1; + + env_loadsplash = getenv("loadsplash"); + if (!env_loadsplash) { + printf("Environment variable loadsplash not found!\n"); + return 1; + } + + if (run_command_list(env_loadsplash, -1, 0)) { + printf("Failed to run loadsplash %s\n\n", env_loadsplash); + return 1; + } + printf("leaving splash_screen_prepare\n"); + return 0; +} + static void setup_buttons(void) { imx_iomux_v3_setup_multiple_pads(button_pads, diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index aea91bc..3cd850d 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -38,7 +38,7 @@ #define CONFIG_REVISION_TAG /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) +#define CONFIG_SYS_MALLOC_LEN (15 * 1024 * 1024) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_MISC_INIT_R @@ -149,6 +149,13 @@ #define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE #define CONFIG_VIDEO_BMP_RLE8 #define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN + +#define CONFIG_VIDEO_BMP_GZIP +#ifdef CONFIG_VIDEO_BMP_GZIP +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (6 * 1024 * 1024) +#endif + #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 260000000 @@ -208,6 +215,8 @@ "echo ; echo serial console at 115200, 8N1 ; echo ; " \ "echo details at http://boundarydevices.com/6q_bootscript ; " \ "setenv stdout serial\0" \ + "loadsplash=if sf probe ; then " \ + "sf read ${splashimage} c2000 ${splashsize} ; fi\0" \ "upgradeu=for dtype in " CONFIG_DRIVE_TYPES \ "; do " \ "for disk in 0 1 ; do ${dtype} dev ${disk} ;" \