From patchwork Fri Oct 9 16:18:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54719 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 92AC422DB6 for ; Fri, 9 Oct 2015 16:19:43 +0000 (UTC) Received: by wicgi15 with SMTP id gi15sf24330364wic.2 for ; Fri, 09 Oct 2015 09:19:42 -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=gwOW6pH0mUry25cA5PiWkSCUTYnTuN3BJ01F8u7LYENFjAYG88Yg8mT/fEMd3jINuB 9UHhbGcWDQnOJ7Qv4pB4iAD9rVpma6LqZ0Xz0s5rcTgyF7wspEhV7EDsAxUFCNa+CMgX SqisDIN9HeVmSXLChfkuke9zDxhzJgc9T8wHisVv2KW01a303Bqij6fv+zbQwEKVCunn fFFzs/ZKJdyfk2Pe0LumLdq2ltdnPHYTfQxqSmcNaoq/IRsH4li0N4ZxQIf8QovKXDNA Sd4NN8zIa2BvZvMHRx+t67XvYYmJxyUB9WpUyx5H22bp0rLA9N2LYauMiEbkRL+fMMDB Ak0A== X-Gm-Message-State: ALoCoQmO+olM4VgDqT6cxUVlBUC8ohb0LI10pNQcMgLxBmPXdDRujj5fipLZetZeoCUXL6hxKNot X-Received: by 10.112.142.195 with SMTP id ry3mr2841202lbb.22.1444407582901; Fri, 09 Oct 2015 09:19:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.44.12 with SMTP id s12ls324752lfs.90.gmail; Fri, 09 Oct 2015 09:19:42 -0700 (PDT) X-Received: by 10.112.156.193 with SMTP id wg1mr7022801lbb.24.1444407582630; Fri, 09 Oct 2015 09:19:42 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id h11si1726655lbo.151.2015.10.09.09.19.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2015 09:19:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbos8 with SMTP id s8so85393881lbo.0 for ; Fri, 09 Oct 2015 09:19:42 -0700 (PDT) X-Received: by 10.25.150.199 with SMTP id y190mr4711913lfd.35.1444407582380; Fri, 09 Oct 2015 09:19:42 -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 w3csp84835lbq; Fri, 9 Oct 2015 09:19:41 -0700 (PDT) X-Received: by 10.180.219.106 with SMTP id pn10mr162634wic.56.1444407581580; Fri, 09 Oct 2015 09:19:41 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id iy19si19437759wic.120.2015.10.09.09.19.41; Fri, 09 Oct 2015 09:19:41 -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 004724B8BB; Fri, 9 Oct 2015 18:19:38 +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 dBAox7rr6W5W; Fri, 9 Oct 2015 18:19:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8CE4B4B8AD; Fri, 9 Oct 2015 18:19:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 975334B894 for ; Fri, 9 Oct 2015 18:18:32 +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 VHLbxfF0Ojqc for ; Fri, 9 Oct 2015 18:18:32 +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-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by theia.denx.de (Postfix) with ESMTPS id 438F84B892 for ; Fri, 9 Oct 2015 18:18:28 +0200 (CEST) Received: by wicge5 with SMTP id ge5so75282469wic.0 for ; Fri, 09 Oct 2015 09:18:28 -0700 (PDT) X-Received: by 10.180.207.235 with SMTP id lz11mr130466wic.1.1444407507909; Fri, 09 Oct 2015 09:18:27 -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 bf8sm2942173wjc.22.2015.10.09.09.18.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Oct 2015 09:18:27 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Fri, 9 Oct 2015 17:18:06 +0100 Message-Id: <1444407488-32646-9-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1444407488-32646-1-git-send-email-ryan.harkin@linaro.org> References: <1444407488-32646-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v4 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.217.182 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