From patchwork Wed Sep 23 17:25:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54065 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 B2F6422E14 for ; Wed, 23 Sep 2015 17:27:52 +0000 (UTC) Received: by lamf6 with SMTP id f6sf27502597lam.1 for ; Wed, 23 Sep 2015 10:27:51 -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=i9vBs6i4+IQZ4oGxBQ8oAbMDF3C5vylxeWqkMPYvWQ4=; b=KgFw/80F6f+i14yala7VMx83b+VEe2rG0MJvdlqzfXOIz+m1s7iS6ulso7zjBnlpZf 3pv4ntixNA1z+0tNL/IEXm4YoJxyg5B7F9WnKdZ25Zi7Bu2ld4z9fXNH92jYc04uuz3H Y55uTYtGxyoYPN3g3s0WfybOzMApkjvTexCpUo1CApWf5+5eGsW4YzExzWfsJagACMNA UwhP3QVfeWvLeXWm2jvljqv4hd/UqieuibmXFleNi2Hwho4ShXk3+Zcrs0K5KqHceOyN hklJ5auVAOmrqrDbtSjUuWUtY2/ZH8gML9IZBuw7R06eeGTukxuuV4d+xfbDWJLR1fM2 wugQ== X-Gm-Message-State: ALoCoQnM6es0vEgqv3bmo149YLCGRpUBo93Zg/749vIRXKmhPX1qAMrSj8eA5xIjwvy+aGFIo5+7 X-Received: by 10.180.160.146 with SMTP id xk18mr817113wib.3.1443029271694; Wed, 23 Sep 2015 10:27:51 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.10 with SMTP id w10ls58821law.69.gmail; Wed, 23 Sep 2015 10:27:51 -0700 (PDT) X-Received: by 10.152.10.4 with SMTP id e4mr12195837lab.79.1443029271410; Wed, 23 Sep 2015 10:27:51 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id ut6si2655341lbc.67.2015.09.23.10.27.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 10:27:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lahg1 with SMTP id g1so59516154lah.1 for ; Wed, 23 Sep 2015 10:27:51 -0700 (PDT) X-Received: by 10.112.199.70 with SMTP id ji6mr12108045lbc.73.1443029271034; Wed, 23 Sep 2015 10:27:51 -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 w3csp23657lbq; Wed, 23 Sep 2015 10:27:50 -0700 (PDT) X-Received: by 10.112.168.7 with SMTP id zs7mr12132414lbb.26.1443029270584; Wed, 23 Sep 2015 10:27:50 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id c5si4517408laa.134.2015.09.23.10.27.45; Wed, 23 Sep 2015 10:27:50 -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 7A4364B959; Wed, 23 Sep 2015 19:27:39 +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 nOLlcL4RgfxZ; Wed, 23 Sep 2015 19:27:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EFD574B951; Wed, 23 Sep 2015 19:27:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1C044B93B for ; Wed, 23 Sep 2015 19:27:23 +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 pHHJ-WIGHh1L for ; Wed, 23 Sep 2015 19:27:23 +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-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by theia.denx.de (Postfix) with ESMTPS id 5E0334B935 for ; Wed, 23 Sep 2015 19:27:19 +0200 (CEST) Received: by pacex6 with SMTP id ex6so46083398pac.0 for ; Wed, 23 Sep 2015 10:27:18 -0700 (PDT) X-Received: by 10.66.145.193 with SMTP id sw1mr31280536pab.74.1443029238001; Wed, 23 Sep 2015 10:27:18 -0700 (PDT) Received: from localhost.localdomain ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id fm5sm9061765pab.24.2015.09.23.10.27.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Sep 2015 10:27:17 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Wed, 23 Sep 2015 10:25:41 -0700 Message-Id: <1443029143-22313-10-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443029143-22313-1-git-send-email-ryan.harkin@linaro.org> References: <1443029143-22313-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH 09/11] 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.53 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