From patchwork Thu Oct 1 17:43:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54395 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 2546423009 for ; Thu, 1 Oct 2015 17:45:18 +0000 (UTC) Received: by laak17 with SMTP id k17sf39706188laa.3 for ; Thu, 01 Oct 2015 10:45:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=O8olScQY+9WCbqPR4sGRR4V4D55k5nMYDKzXYC6BnQ0=; b=TP7Qmn97fdqJCwKTxZOA5NgsKyFWGrvjNdpPbvumVkLz2wZsinfVdyM4nWPlhffg78 GwZBcdA8UjygDaHubnjIBOZ5ysbAkMSIdGbFcDN/hUa0odqyTrGCLRA5qK9+wKve+snM CB8/yH0XygVXrscYML6bm+bp52qFCM5XFh0MOWPhLH7apNw1E0Zx61Pvb5U6GVxR0p+H xJp50VAd9ZYhSnZcDtfNpis8cKa73yGrUSXeaL9q7ujASOd3hjb4eFBR5n0mJsdInQ/C HxAoA8sFOw/OjtnIiNmGk6UmxDUtj/kqw8K8KTE0SRj6WGh+5zJeFfSPCzEqJzqQRQ+2 NykA== X-Gm-Message-State: ALoCoQkmfsLO+v1HRKHDsQ2ZBrTDJxqY99RP8spT1q4Q+yeO9VLEd3MOLxnPskMIA6MLDZu/YrLw X-Received: by 10.194.156.193 with SMTP id wg1mr1668652wjb.3.1443721516023; Thu, 01 Oct 2015 10:45:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.28.200 with SMTP id c191ls131911lfc.71.gmail; Thu, 01 Oct 2015 10:45:15 -0700 (PDT) X-Received: by 10.112.156.193 with SMTP id wg1mr3386523lbb.24.1443721515726; Thu, 01 Oct 2015 10:45:15 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id xf5si3428121lbb.93.2015.10.01.10.45.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 10:45:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labzv5 with SMTP id zv5so79610225lab.1 for ; Thu, 01 Oct 2015 10:45:15 -0700 (PDT) X-Received: by 10.25.20.80 with SMTP id k77mr2280935lfi.117.1443721515603; Thu, 01 Oct 2015 10:45:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp746745lbq; Thu, 1 Oct 2015 10:45:15 -0700 (PDT) X-Received: by 10.180.39.136 with SMTP id p8mr102184wik.10.1443721514999; Thu, 01 Oct 2015 10:45:14 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id av9si8596998wjc.100.2015.10.01.10.45.14; Thu, 01 Oct 2015 10:45:14 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4EA994B989; Thu, 1 Oct 2015 19:44:34 +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 h4KVXjaVwqhD; Thu, 1 Oct 2015 19:44:34 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5FAA4B9D0; Thu, 1 Oct 2015 19:44:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E3E3A4B9B9 for ; Thu, 1 Oct 2015 19:44:04 +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 TuKu0IiuuCFw for ; Thu, 1 Oct 2015 19:44:04 +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-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by theia.denx.de (Postfix) with ESMTPS id 0CBBC4B889 for ; Thu, 1 Oct 2015 19:43:53 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so1517808wic.0 for ; Thu, 01 Oct 2015 10:43:53 -0700 (PDT) X-Received: by 10.194.120.198 with SMTP id le6mr11834502wjb.133.1443721432957; Thu, 01 Oct 2015 10:43:52 -0700 (PDT) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id xt1sm7198426wjb.32.2015.10.01.10.43.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 10:43:52 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Thu, 1 Oct 2015 18:43:34 +0100 Message-Id: <1443721416-725-9-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443721416-725-1-git-send-email-ryan.harkin@linaro.org> References: <1443721416-725-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v3 08/10] vexpress64: juno: add optional initrd X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.harkin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Some OS images require an initrd on Juno. If the file ramdisk.img exists in NOR flash, then we load it and pass the address to the kernel. Otherwise, we pass the "-" parameter as before. Signed-off-by: Ryan Harkin Reviewed-by: Linus Walleij CC: David Feng CC: Bhupesh Sharma CC: Linus Walleij --- include/configs/vexpress_aemv8a.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 5198b32..c62c3ac 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -187,6 +187,8 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=Image\0" \ "kernel_addr=0x80000000\0" \ + "initrd_name=ramdisk.img\0" \ + "initrd_addr=0x84000000\0" \ "fdt_name=juno\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ @@ -205,7 +207,12 @@ #define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \ "afs load ${fdt_name} ${fdt_addr} ; " \ "fdt addr ${fdt_addr}; fdt resize; " \ - "booti ${kernel_addr} - ${fdt_addr}" + "if afs load ${initrd_name} ${initrd_addr} ; "\ + "then "\ + " setenv initrd_param ${initrd_addr}; "\ + " else setenv initrd_param -; "\ + "fi ; " \ + "booti ${kernel_addr} ${initrd_param} ${fdt_addr}" #define CONFIG_BOOTDELAY 1