From patchwork Mon May 30 16:07:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eran Matityahu X-Patchwork-Id: 627880 X-Patchwork-Delegate: hs@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 3rJM3904myz9sC4 for ; Tue, 31 May 2016 02:07:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=variscite.com header.i=@variscite.com header.b=bMAPKTFh; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 754E5A7498; Mon, 30 May 2016 18:07:42 +0200 (CEST) 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 U5SDdgTlkJUr; Mon, 30 May 2016 18:07:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 69F7A4B656; Mon, 30 May 2016 18:07:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 352A84B656 for ; Mon, 30 May 2016 18:07:32 +0200 (CEST) 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 fuR6VkX9Prs7 for ; Mon, 30 May 2016 18:07:31 +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-wm0-f48.google.com (mail-wm0-f48.google.com [74.125.82.48]) by theia.denx.de (Postfix) with ESMTPS id 47B304B624 for ; Mon, 30 May 2016 18:07:25 +0200 (CEST) Received: by mail-wm0-f48.google.com with SMTP id z87so16893380wmh.1 for ; Mon, 30 May 2016 09:07:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=variscite.com; s=variscite; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=d3UufDDNy1BEEsxy7/JFo08knXS/Y72eqdXGzGMmbmk=; b=bMAPKTFhSDbO6O1fkA4Y9IXARe6+l9+qKX12qtfPoh20Pwrjke94zkG9tlWN+xdIzO bS0PxrGcHYXt6lBTnGXXdyhFkEm4txfEh2/wnmy4VtNfxhaghg7V14S/ppPS3WXAe3ZF E8A36n76qqEtyKqBL1FrhT6/td//y+vILuIsU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=d3UufDDNy1BEEsxy7/JFo08knXS/Y72eqdXGzGMmbmk=; b=f2XgujHnv6Ib39BVk5lO16fCFPZ8w6gnZSAMbJt1kl1Pb7T+flwdWkLUHpJoyK7RZo AQfCYEoae1fDlYe579E6eI6nGGrrudJCMVAP/HATMpj+d551jgRuwyogFIrnzeOhw0ex nsKB9q9+zH72FhwRJ8UwbgVuljlTAdVWN9jw5CZLZsC0cwSSP+5+BDiTkykIdmwVq8M2 5GHCpx+sR/BLDJJmfe3hGv4L71uRnwcys+aQOxclPLbxQ9cBXMImcuwiTjqsdPNgoQzk PvzuCfFUod1umyG65vJeWoC8zGfBSieaMVJWrwA22nr6RDZogvufDqkaEUCJ/nRCSpje t5Jg== X-Gm-Message-State: ALyK8tL5bo3JbUClONxttkjTtipo8EyJI5sbwZSi1eVEZBjeRXdT99dnvrnmqhI1sNqumG5a X-Received: by 10.194.243.231 with SMTP id xb7mr27354885wjc.33.1464624444653; Mon, 30 May 2016 09:07:24 -0700 (PDT) Received: from ubuntu (84.94.130.170.cable.012.net.il. [84.94.130.170]) by smtp.gmail.com with ESMTPSA id d7sm24601121wmd.11.2016.05.30.09.07.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 30 May 2016 09:07:23 -0700 (PDT) Date: Mon, 30 May 2016 19:07:17 +0300 From: Eran Matityahu To: u-boot@lists.denx.de Message-ID: <20160530160717.GA66441@ubuntu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Tom Rini Subject: [U-Boot] [PATCH v2] splash_source: add support for ubifs formatted nand X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" Add support for loading splash image from NAND Flash formatted with a (UBI) filesystem. Signed-off-by: Eran Matityahu Cc: Igor Grinberg Cc: Tom Rini Cc: Nikita Kiryanov Cc: Stefano Babic Acked-by: Nikita Kiryanov --- Changes for v2: - Following Nikita's comments: - Use the ubi volume field to identify the UBIFS usage - Changed FS_TYPE_ANY to FS_TYPE_UBIFS - Added a second definition of splash_umount_ubifs ifndef CONFIG_CMD_UBIFS - Replace license identifier to GPL-2.0+ in include/splash.h - Changed ubi_volume to ubivol common/splash_source.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++---- include/splash.h | 23 +++++--------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/common/splash_source.c b/common/splash_source.c index a09dd4b..e132a82 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -120,6 +120,12 @@ static int splash_select_fs_dev(struct splash_location *location) case SPLASH_STORAGE_SATA: res = fs_set_blk_dev("sata", location->devpart, FS_TYPE_ANY); break; + case SPLASH_STORAGE_NAND: + if (location->ubivol != NULL) + res = fs_set_blk_dev("ubi", NULL, FS_TYPE_UBIFS); + else + res = -ENODEV; + break; default: printf("Error: unsupported location storage.\n"); return -ENODEV; @@ -163,6 +169,41 @@ static inline int splash_init_sata(void) } #endif +#ifdef CONFIG_CMD_UBIFS +static int splash_mount_ubifs(struct splash_location *location) +{ + int res; + char cmd[32]; + + sprintf(cmd, "ubi part %s", location->mtdpart); + res = run_command(cmd, 0); + if (res) + return res; + + sprintf(cmd, "ubifsmount %s", location->ubivol); + res = run_command(cmd, 0); + + return res; +} + +static inline int splash_umount_ubifs(void) +{ + return run_command("ubifsumount", 0); +} +#else +static inline int splash_mount_ubifs(struct splash_location *location) +{ + printf("Cannot load splash image: no UBIFS support\n"); + return -ENOSYS; +} + +static inline int splash_umount_ubifs(void) +{ + printf("Cannot unmount UBIFS: no UBIFS support\n"); + return -ENOSYS; +} +#endif + #define SPLASH_SOURCE_DEFAULT_FILE_NAME "splash.bmp" static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) @@ -181,26 +222,36 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) if (location->storage == SPLASH_STORAGE_SATA) res = splash_init_sata(); + if (location->ubivol != NULL) + res = splash_mount_ubifs(location); + if (res) return res; res = splash_select_fs_dev(location); if (res) - return res; + goto out; res = fs_size(splash_file, &bmp_size); if (res) { printf("Error (%d): cannot determine file size\n", res); - return res; + goto out; } if (bmp_load_addr + bmp_size >= gd->start_addr_sp) { printf("Error: splashimage address too high. Data overwrites U-Boot and/or placed beyond DRAM boundaries.\n"); - return -EFAULT; + res = -EFAULT; + goto out; } splash_select_fs_dev(location); - return fs_read(splash_file, bmp_load_addr, 0, 0, NULL); + res = fs_read(splash_file, bmp_load_addr, 0, 0, NULL); + +out: + if (location->ubivol != NULL) + splash_umount_ubifs(); + + return res; } /** diff --git a/include/splash.h b/include/splash.h index f0755ca..617b514 100644 --- a/include/splash.h +++ b/include/splash.h @@ -1,22 +1,7 @@ /* * Copyright (C) 2013, Boundary Devices * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., http://www.fsf.org/about/contact/ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _SPLASH_H_ @@ -41,8 +26,10 @@ struct splash_location { char *name; enum splash_storage storage; enum splash_flags flags; - u32 offset; /* offset from start of storage */ - char *devpart; /* Use the load command dev:part conventions */ + u32 offset; /* Offset from start of storage */ + char *devpart; /* Use the load command dev:part conventions */ + char *mtdpart; /* MTD partition for ubi part */ + char *ubivol; /* UBI volume-name for ubifsmount */ }; int splash_source_load(struct splash_location *locations, uint size);