From patchwork Thu Sep 1 11:34:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 112881 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 90D00B6F6F for ; Thu, 1 Sep 2011 21:36:39 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0730C28168; Thu, 1 Sep 2011 13:36:31 +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 GDz9ZZjb7Y9e; Thu, 1 Sep 2011 13:36:30 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 973BA28156; Thu, 1 Sep 2011 13:36:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4C54928150 for ; Thu, 1 Sep 2011 13:36:27 +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 JwJHPyftFk8x for ; Thu, 1 Sep 2011 13:36:26 +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-bw0-f44.google.com (mail-bw0-f44.google.com [209.85.214.44]) by theia.denx.de (Postfix) with ESMTPS id 3287C28168 for ; Thu, 1 Sep 2011 13:36:20 +0200 (CEST) Received: by mail-bw0-f44.google.com with SMTP id r4so1508588bka.3 for ; Thu, 01 Sep 2011 04:36:20 -0700 (PDT) Received: by 10.204.130.11 with SMTP id q11mr913951bks.91.1314876980066; Thu, 01 Sep 2011 04:36:20 -0700 (PDT) Received: from Pali-EliteBook.kolej.mff.cuni.cz (rohar.kolej.mff.cuni.cz [78.128.193.202]) by mx.google.com with ESMTPS id a17sm159596bku.56.2011.09.01.04.36.18 (version=SSLv3 cipher=OTHER); Thu, 01 Sep 2011 04:36:19 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: u-boot@lists.denx.de Date: Thu, 1 Sep 2011 13:34:32 +0200 Message-Id: <1314876881-9669-6-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314876881-9669-1-git-send-email-pali.rohar@gmail.com> References: <201109011304.46581.marek.vasut@gmail.com> <1314876881-9669-1-git-send-email-pali.rohar@gmail.com> Subject: [U-Boot] [PATCH 06/15] Look for boot.scr on 'mmc 0:3' instead 'mmc 0' and add support for loading boot.scr from 'mmc 2:1' X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 From: Matan Ziv-Av --- include/configs/nokia_rx51.h | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 5c3b068..bc4bd0b 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -188,16 +188,22 @@ int rx51_kp_getc(void); "vgacon=setenv con vga; run setcon\0" \ "loadaddr=0x82000000\0" \ "meegoargs=setenv bootargs\0" \ - "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ + "loadbootscript=fatload mmc 0:3 ${loadaddr} boot.scr\0" \ + "loadibootscript=fatload mmc 2:1 ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source ${loadaddr}\0" \ "loaduimage=fatload mmc 0:3 ${loadaddr} uImage\0" \ + "loadiuimage=fatload mmc 2:1 ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc ...; " \ "run meegoargs; " \ "bootm ${loadaddr}\0" \ "noloboot=echo Booting NOLO supplied kernel ...; " \ "setenv atags ${nolo_atagaddr};" \ - "bootm ${nolo_kernaddr}\0" + "bootm ${nolo_kernaddr}\0" \ + "mmciboot=echo Booting from internal mmc ...; " \ + "fatload mmc 2:1 ${loadaddr} uImage;" \ + "run meegoargs; " \ + "bootm ${loadaddr}\0" #define CONFIG_PREBOOT \ "if test $slide_sw != open ; then run noloboot; fi ;" \ @@ -210,12 +216,18 @@ int rx51_kp_getc(void); #define CONFIG_BOOTCOMMAND \ "if mmc init; then " \ - "if run loadbootscript; then " \ + "if run loadibootscript; then " \ + "echo Found boot.scr on mmc 2:1; " \ "run bootscript; " \ "else " \ - "if run loaduimage; then " \ - "run mmcboot; " \ - "else run noloboot; " \ + "if run loadbootscript; then " \ + "echo Found boot.scr on mmc 0:3; " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run noloboot; " \ + "fi; " \ "fi; " \ "fi; " \ "else run noloboot; fi"