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: 521789 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 86FD91401DE for ; Thu, 24 Sep 2015 03:27:46 +1000 (AEST) 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jr7C6QDYhq4t0qHXBDZ95lCRwuWDcTpuPKYHfYTahI4=; b=gFYf/QLQB2m2YmiZ2r3I7VYqFy7aj/VShJAIHuTXeoClLkqoOvk84bSPHgnKo76/Ac xQTXQzlCZ++DBUHoqxlmhPAP3b++Fv6NCycYkfCyvrKNPUUHhdRk92KJOZmeRTgWISBe TgKq2oBLbzjub8TvnLbKjzwxlSE4GVTJFyrW347bHzFLIlv8ADBVg5PqicyflBkdISrV D+Fim2yfUP7hjFbuqBohfXY+5JXaXKiF+DOcC5t71sVEasJFaE1hmcJ/W4gVbM2A1ITX 9twzTigaasGn27YYHhr16k10W/55XDAA77S1c+0zsrtiVOyX1Uc134/92Z5KxOwR3HS1 eK2g== X-Gm-Message-State: ALoCoQkVK3tPl0Qbz69ojTyNfT4LyKFBmhQQD+p1ObOvIcAZkZEcTR0q0C0dpONHASD1H/NMciaX 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: U-Boot discussion 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" 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