From patchwork Tue Sep 29 15:47:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54239 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by patches.linaro.org (Postfix) with ESMTPS id 2A98822EAF for ; Tue, 29 Sep 2015 15:48:39 +0000 (UTC) Received: by wicgb1 with SMTP id gb1sf7983487wic.3 for ; Tue, 29 Sep 2015 08:48:38 -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=0HTWkkxwlo2t1XlzkPVNBLwpOgcZRd2k9bse1Lt6crE=; b=OJuIG555ZQb0NbnHRmJw9XMb28LMs/rAq9MZncYa+yKl6ifM+hBXn6Njr+2Av9ZKzX N5b5e4Xb5v+p79i+udonxm8WLo0Lkust7dvqIdTVJJqQkhjDxTxq2IcdhPlSKtU0zjFR KbA3HTF4h6nxD8QORkZEbE0BER6V34UpUiakWuFXFVO5WuiXYbDsfXoFhjih/5lvqus7 H/9ZvwbmFrF8yzpR2xw8c86wyL3PJ8vbFFyg0Qx03xRYEiUlUulJ8kvm8qPwfHd/K7wg 17HmWfghJO96XCFTWHB0Z9TAUyfX9A2s30hlUx1SskYxmz+Igfe3Jj3iMHlcjUdEtgoU TWGQ== X-Gm-Message-State: ALoCoQkaFdcqHOvoi1ue7WACwOLG6N4gBlyZ/ErhyXv8J6fReYCOqIc5Todv+8XCoTYCb/0/nseE X-Received: by 10.152.22.101 with SMTP id c5mr4409165laf.0.1443541718422; Tue, 29 Sep 2015 08:48:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.98 with SMTP id r2ls58953lah.45.gmail; Tue, 29 Sep 2015 08:48:38 -0700 (PDT) X-Received: by 10.152.20.200 with SMTP id p8mr7647937lae.122.1443541718283; Tue, 29 Sep 2015 08:48:38 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id sk1si11195159lbb.44.2015.09.29.08.48.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 08:48:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lahh2 with SMTP id h2so14014096lah.0 for ; Tue, 29 Sep 2015 08:48:38 -0700 (PDT) X-Received: by 10.112.64.72 with SMTP id m8mr7344508lbs.41.1443541718152; Tue, 29 Sep 2015 08:48:38 -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 w3csp2224212lbq; Tue, 29 Sep 2015 08:48:37 -0700 (PDT) X-Received: by 10.194.203.5 with SMTP id km5mr24326957wjc.52.1443541717323; Tue, 29 Sep 2015 08:48:37 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id hf3si10711051wib.55.2015.09.29.08.48.36; Tue, 29 Sep 2015 08:48:37 -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 5D66E4B8DC; Tue, 29 Sep 2015 17:48:27 +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 YwKp3A7cP_ps; Tue, 29 Sep 2015 17:48:27 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AECBF4B8D7; Tue, 29 Sep 2015 17:48:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EA9524B8D1 for ; Tue, 29 Sep 2015 17:47:48 +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 lxJjntxXaAZj for ; Tue, 29 Sep 2015 17:47:48 +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-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by theia.denx.de (Postfix) with ESMTPS id 16CB94B8CD for ; Tue, 29 Sep 2015 17:47:44 +0200 (CEST) Received: by wicge5 with SMTP id ge5so156736897wic.0 for ; Tue, 29 Sep 2015 08:47:44 -0700 (PDT) X-Received: by 10.194.80.100 with SMTP id q4mr28556253wjx.113.1443541663912; Tue, 29 Sep 2015 08:47:43 -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 kb9sm24555824wjb.49.2015.09.29.08.47.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 08:47:43 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 29 Sep 2015 16:47:18 +0100 Message-Id: <1443541640-7810-9-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> References: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v2 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.49 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 --- 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 f9fa2ce..99dd8b6 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -189,6 +189,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" \ @@ -207,7 +209,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