From patchwork Thu Mar 14 15:55:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 227725 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 11BEB2C00CC for ; Fri, 15 Mar 2013 02:56:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 860974A199; Thu, 14 Mar 2013 16:56:07 +0100 (CET) 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 9rbUN4YcSEbf; Thu, 14 Mar 2013 16:56:07 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AB1874A19F; Thu, 14 Mar 2013 16:55:55 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5D2224A20B for ; Thu, 14 Mar 2013 16:55:51 +0100 (CET) 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 gpwnYhNCK-JD for ; Thu, 14 Mar 2013 16:55:50 +0100 (CET) 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-gg0-f174.google.com (mail-gg0-f174.google.com [209.85.161.174]) by theia.denx.de (Postfix) with ESMTPS id 0EAF14A1A7 for ; Thu, 14 Mar 2013 16:55:37 +0100 (CET) Received: by mail-gg0-f174.google.com with SMTP id k5so408894ggd.33 for ; Thu, 14 Mar 2013 08:55: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=YG68ZaSrQLqAusk8tt51SPgsT1jirwNDlKrut8w2dTs=; b=PdBweFj1R3wt6BMF4HJiB/UugIOiY9ErriS9vztaKcDxUZOu23kLXq62QUu+XUFdCx 57qOCdBNnNPPY+AsapWaJdCz305cdRCHUcc+//93ZI2+Yn+RS0uyw+MHKKsRgJpc322I RMhDvONwnS7ht2fR/1MNc2uj3OWh5IBTpQS0qJwceQXYAqRLr0eaJeHDDXlixAgG5GtH asr3CV4x4gwcPjWcyZFgotPrwHgOZ4IIQ7GSP5Wdi40Do5FV+PaFMzJu9eAo0RZpRGFL Z8lEOcFatZIghQsGObAaNFWj/TvDHv/XKTKHWiz2LyJg9VLEliXyIfl3bJz8W3nhByVu Zjlg== X-Received: by 10.236.118.178 with SMTP id l38mr3788717yhh.31.1363276536095; Thu, 14 Mar 2013 08:55:36 -0700 (PDT) Received: from localhost.localdomain (cpe-065-184-250-089.ec.res.rr.com. [65.184.250.89]) by mx.google.com with ESMTPS id g69sm5291272yhh.17.2013.03.14.08.55.33 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Mar 2013 08:55:35 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Date: Thu, 14 Mar 2013 11:55:21 -0400 Message-Id: <1363276521-11283-4-git-send-email-trini@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1363276521-11283-1-git-send-email-trini@ti.com> References: <1363276521-11283-1-git-send-email-trini@ti.com> Cc: Koen Kooi Subject: [U-Boot] [PATCH v3 3/3] am335x_evm: Add more variables and switch to DT booting. 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 From: Koen Kooi Make bootcmd run findfdt so that we know what dtb file to load. Add a loadfdt command to load this file in. Make mmcboot pass in ${fdtaddr} and make the mmc section of bootcmd run loadfdt. Signed-off-by: Koen Kooi Signed-off-by: Tom Rini Acked-by: Peter Korsgaard --- include/configs/am335x_evm.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index c0e4724..6a842e0 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -54,7 +54,8 @@ "fdtaddr=0x80F80000\0" \ "fdt_high=0xffffffff\0" \ "rdaddr=0x81000000\0" \ - "bootfile=/boot/uImage\0" \ + "bootdir=/boot\0" \ + "bootfile=uImage\0" \ "fdtfile=\0" \ "console=ttyO0,115200n8\0" \ "optargs=\0" \ @@ -77,10 +78,11 @@ "root=${ramroot} " \ "rootfstype=${ramrootfstype}\0" \ "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loaduimage=load mmc ${bootpart} ${loadaddr} ${bootfile}\0" \ + "loaduimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ - "bootm ${loadaddr}\0" \ + "bootm ${loadaddr} - ${fdtaddr}\0" \ "ramboot=echo Booting from ramdisk ...; " \ "run ramargs; " \ "bootm ${loadaddr}\0" \ @@ -95,6 +97,7 @@ "setenv fdtfile am335x-evmsk.dtb; fi\0" \ #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ "mmc dev ${mmcdev}; if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ "if run loadbootenv; then " \ @@ -106,6 +109,7 @@ "run uenvcmd;" \ "fi;" \ "if run loaduimage; then " \ + "run loadfdt;" \ "run mmcboot;" \ "fi;" \ "fi;" \