From patchwork Tue Apr 28 23:17:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ash Charles X-Patchwork-Id: 465804 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 EC0EC14007F for ; Wed, 29 Apr 2015 09:18:58 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=vsXibvru; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02B144BA45; Wed, 29 Apr 2015 01:18:43 +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 Z2DSjodGud4L; Wed, 29 Apr 2015 01:18:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id ABD264B8CF; Wed, 29 Apr 2015 01:18:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EED594BA25 for ; Wed, 29 Apr 2015 01:18:11 +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 Dkzh9TvB60-H for ; Wed, 29 Apr 2015 01:18:11 +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-pa0-f47.google.com (mail-pa0-f47.google.com [209.85.220.47]) by theia.denx.de (Postfix) with ESMTPS id 169D04BA1D for ; Wed, 29 Apr 2015 01:18:02 +0200 (CEST) Received: by pabsx10 with SMTP id sx10so9550252pab.3 for ; Tue, 28 Apr 2015 16:18:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UQFHrNcjpObkDRSnRQut78JaAvDLaJrlHmUMmwtONyY=; b=vsXibvruIRLEqKbxPmtoJlEPZ+ts+FK+1MaxLS59pnfLfy325AZSGex6fhFxx40Kk7 putxB4MSRTQ5z+J/8vMhLX9xruL5UomHjbJf9Axp+jxtm8zD3l0rPQd3+E69VJtigLhM 01c9WC1fR4hHYv0DcC1MchDVfXUIrq5vw7YAILmOffPit4MGeJP+GRm8IXlgHIBt+f8+ BGQBaaazxW64RgDTJ/0nOWrC7TwkIajzWz3KzRdHNt4xcx+uGCy7ByJ8duLFSLYgk4qH Lplp0XSJfKDxqHt4spcn15tsd7WGIIS2vaMfDEAsO/N4hT467B8S6faMsJuYJa+gbjBb 8xlg== X-Received: by 10.66.141.202 with SMTP id rq10mr37123612pab.64.1430263081008; Tue, 28 Apr 2015 16:18:01 -0700 (PDT) Received: from gumstux.mystix.com (s206-116-3-180.bc.hsia.telus.net. [206.116.3.180]) by mx.google.com with ESMTPSA id c1sm23477686pdc.45.2015.04.28.16.18.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Apr 2015 16:18:00 -0700 (PDT) From: Ash Charles To: u-boot@lists.denx.de Date: Tue, 28 Apr 2015 16:17:54 -0700 Message-Id: <1430263075-27682-6-git-send-email-ashcharles@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1430263075-27682-1-git-send-email-ashcharles@gmail.com> References: <1430263075-27682-1-git-send-email-ashcharles@gmail.com> Subject: [U-Boot] [PATCH 5/6] omap3: overo: Allow boot with kernel in UBI rootfs 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" If regular NAND booting fails to find a valid uImage in the kernel partition in NAND, try to boot using a zImage and dtb found in a UBI volume in the rootfs partition. This is the NAND analog of mmc zImage booting for device-tree based kernels. Signed-off-by: Ash Charles Signed-off-by: Arun Bharadwaj --- include/configs/omap3_overo.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 61213df..e1db29a 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -140,6 +140,8 @@ "bootm ${loadaddr}\0" \ "loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\0" \ "loadfdt=load mmc ${mmcdev}:2 ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadubizimage=ubifsload ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadubifdt=ubifsload ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcbootfdt=echo Booting with DT from mmc ...; " \ "run mmcargs; " \ "bootz ${loadaddr} - ${fdtaddr}\0" \ @@ -148,6 +150,13 @@ "if nand read ${loadaddr} linux; then " \ "bootm ${loadaddr};" \ "fi;\0" \ + "nanddtsboot=echo Booting from nand with DTS...; " \ + "run nandargs; " \ + "ubi part rootfs; "\ + "ubifsmount ubi0:rootfs; "\ + "run loadubifdt; "\ + "run loadubizimage; "\ + "bootz ${loadaddr} - ${fdtaddr}\0" \ #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev}; if mmc rescan; then " \ @@ -175,6 +184,10 @@ "fi;" \ "fi;" \ "run nandboot; " \ + "if test -z \"${fdtfile}\"; then "\ + "setenv fdtfile omap3-${boardname}-${expansionname}.dtb;" \ + "fi;" \ + "run nanddtsboot; " \ /* * Miscellaneous configurable options