From patchwork Fri Jun 14 17:00:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Winkler X-Patchwork-Id: 251472 X-Patchwork-Delegate: agust@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 9E5FF2C008E for ; Sat, 15 Jun 2013 03:01:31 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B3DE24A033; Fri, 14 Jun 2013 19:01:19 +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 CHoJynTQHXMV; Fri, 14 Jun 2013 19:01:19 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BCFF14A037; Fri, 14 Jun 2013 19:01:07 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4F5D54A020 for ; Fri, 14 Jun 2013 19:01:04 +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 ch9KrkOe7mlo for ; Fri, 14 Jun 2013 19:00:59 +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 (relay2.integra.net [204.130.255.181]) by theia.denx.de (Postfix) with SMTP id 7917B4A025 for ; Fri, 14 Jun 2013 19:00:50 +0200 (CEST) Received: (qmail 14369 invoked from network); 14 Jun 2013 17:00:44 -0000 Received: from unknown (HELO localhost.localdomain) (70.96.116.236) by relay2.integra.net with SMTP; 14 Jun 2013 17:00:44 -0000 From: Robert Winkler To: u-boot@lists.denx.de Date: Fri, 14 Jun 2013 10:00:03 -0700 Message-Id: <1371229203-10840-3-git-send-email-robert.winkler@boundarydevices.com> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1371229203-10840-1-git-send-email-robert.winkler@boundarydevices.com> References: <1371229203-10840-1-git-send-email-robert.winkler@boundarydevices.com> Subject: [U-Boot] [PATCH 2/2] video: lcd: Make splash_screen_prepare weak, remove config macro 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 Remove CONFIG_SPLASH_SCREEN_PREPARE from README Add doc/README.splashprepare to document functionality Signed-off-by: Robert Winkler --- README | 8 -------- common/splash.c | 14 ++++---------- doc/README.splashprepare | 8 ++++++++ 3 files changed, 12 insertions(+), 18 deletions(-) create mode 100644 doc/README.splashprepare diff --git a/README b/README index 0d37d56..fd3d3a5 100644 --- a/README +++ b/README @@ -1604,14 +1604,6 @@ CBFS (Coreboot Filesystem) support => vertically centered image at x = dspWidth - bmpWidth - 9 - CONFIG_SPLASH_SCREEN_PREPARE - - If this option is set then the board_splash_screen_prepare() - function, which must be defined in your code, is called as part - of the splash screen display sequence. It gives the board an - opportunity to prepare the splash image data before it is - processed and sent to the frame buffer by U-Boot. - - Gzip compressed BMP image support: CONFIG_VIDEO_BMP_GZIP If this option is set, additionally to standard BMP diff --git a/common/splash.c b/common/splash.c index fe13c69..c40861a 100644 --- a/common/splash.c +++ b/common/splash.c @@ -21,17 +21,11 @@ */ #include -#include -#ifdef CONFIG_SPLASH_SCREEN_PREPARE -int splash_screen_prepare(void) -{ - return board_splash_screen_prepare(); -} -#else -int splash_screen_prepare(void) +int __splash_screen_prepare(void) { - printf("SPLASH_SCREEN_PREPARE not defined\n"); return 0; } -#endif + +int splash_screen_prepare(void) + __attribute__ ((weak, alias("__splash_screen_prepare"))); diff --git a/doc/README.splashprepare b/doc/README.splashprepare new file mode 100644 index 0000000..8d103bf --- /dev/null +++ b/doc/README.splashprepare @@ -0,0 +1,8 @@ +--------------------------------------------------------------------- +Splash Screen +--------------------------------------------------------------------- +The splash_screen_prepare() function is a weak function defined in +common/splash.c. It is called as part of the splash screen display +sequence. It gives the board an opportunity to prepare the splash +image data before it is processed and sent to the frame buffer by +U-Boot. Define your own version to use this feature.