From patchwork Mon May 13 18:36:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 243494 X-Patchwork-Delegate: trini@ti.com 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 0D8312C0098 for ; Tue, 14 May 2013 04:37:58 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7BCDD4A099; Mon, 13 May 2013 20:37:45 +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 SBvgEqOM7lM5; Mon, 13 May 2013 20:37:45 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B96554A087; Mon, 13 May 2013 20:37:05 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E51714A027 for ; Mon, 13 May 2013 20:36:58 +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 H-U0s0444Lgt for ; Mon, 13 May 2013 20:36:53 +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-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by theia.denx.de (Postfix) with ESMTPS id 667DF4A028 for ; Mon, 13 May 2013 20:36:36 +0200 (CEST) Received: by mail-we0-f177.google.com with SMTP id q58so6405434wes.8 for ; Mon, 13 May 2013 11:36:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=v75ZeiTmwLbwZsQdxfD81uIaC2DuDrFngkiZHH/f3hU=; b=EcqHskFqjOoFA8hL+4bzH0FyJu8jzvQVqG8Tf/AjsOwdG6KAnMcrfHjRvCKzUz+q7r er9aeYBse/8RhMPTLV6xwWPm7hEgbJp2y/fAlCT9tRdIW3sFgR2k/LMn/vorCuq38TgH yI2SZNpSUZekqFwOV6QgnmwgrFyCjnf/4GYfK7QdtNohx4nu6E9r9BAu4U1zjD0nUj+F XG2bVcJXJNfoT/8JRN/cOi/iF42YHEw1O7rSkHEylpGkzcxKszwv4eRHXK3X2+mIB5Mi fOaIUnyhRd7i30AvPLJFZDKqf+mlzsb2u8l9pn6r8mhPdXptXXUGmu26s6Nvud12QMOO 5YrQ== X-Received: by 10.180.37.109 with SMTP id x13mr21081843wij.20.1368470196657; Mon, 13 May 2013 11:36:36 -0700 (PDT) Received: from dell.be.48ers.dk ([2001:6f8:1434:0:6267:20ff:fe4e:21b6]) by mx.google.com with ESMTPSA id ay7sm9728891wib.9.2013.05.13.11.36.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 13 May 2013 11:36:34 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.80) (envelope-from ) id 1Ubxbs-0002h4-BD; Mon, 13 May 2013 20:36:32 +0200 From: Peter Korsgaard To: u-boot@lists.denx.de, trini@ti.com, sbabic@denx.de Date: Mon, 13 May 2013 20:36:26 +0200 Message-Id: <1368470190-10299-3-git-send-email-peter.korsgaard@barco.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368470190-10299-1-git-send-email-peter.korsgaard@barco.com> References: <1368470190-10299-1-git-send-email-peter.korsgaard@barco.com> Cc: Peter Korsgaard Subject: [U-Boot] [PATCHv3 2/6] spl_mmc: mmc_load_image_fat(): Add filename argument and move fat init out 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 So we can use it for falcon mode as well. Signed-off-by: Peter Korsgaard --- drivers/mmc/spl_mmc.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/drivers/mmc/spl_mmc.c b/drivers/mmc/spl_mmc.c index 0c50657..fac6f2d 100644 --- a/drivers/mmc/spl_mmc.c +++ b/drivers/mmc/spl_mmc.c @@ -68,7 +68,7 @@ end: } #ifdef CONFIG_SPL_FAT_SUPPORT -static int mmc_load_image_fat(struct mmc *mmc) +static int mmc_load_image_fat(struct mmc *mmc, const char *filename) { int err; struct image_header *header; @@ -76,27 +76,18 @@ static int mmc_load_image_fat(struct mmc *mmc) header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); - err = fat_register_device(&mmc->block_dev, - CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION); - if (err) { - printf("spl: fat register err - %d\n", err); - hang(); - } - - err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, - header, sizeof(struct image_header)); + err = file_fat_read(filename, header, sizeof(struct image_header)); if (err <= 0) goto end; spl_parse_image_header(header); - err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, - (u8 *)spl_image.load_addr, 0); + err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0); end: if (err <= 0) printf("spl: error reading image %s, err - %d\n", - CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, err); + filename, err); return (err <= 0); } @@ -129,7 +120,15 @@ void spl_mmc_load_image(void) #ifdef CONFIG_SPL_FAT_SUPPORT } else if (boot_mode == MMCSD_MODE_FAT) { debug("boot mode - FAT\n"); - err = mmc_load_image_fat(mmc); + + err = fat_register_device(&mmc->block_dev, + CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION); + if (err) { + printf("spl: fat register err - %d\n", err); + hang(); + } + + err = mmc_load_image_fat(mmc, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME); #endif } else { puts("spl: wrong MMC boot mode\n");