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: 525212 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 11C77140D6D for ; Fri, 2 Oct 2015 03:45:16 +1000 (AEST) 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-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=rh8tjHlY4XS1lUEfMqsUeMaYX1k1dFcWmu6eUQd0724=; b=BO7944V92dmUITq9I3DuStuQj7XPSx1lhRi9onUiXocKr0fwfxbP4mkOdmpO957Vvy fEZbgAAjoH1BbQEFdwIZvoIPMvwQQqtves+qWhtcL8iqyHtpv0pyP2V1Je7kdPZMK2MU Enu9ZiYNtONqrImRh5kcAGeBKnMc8mgZQJ5aBHvJhFAp3tgPZYsWn0qOJnW5rYZGBjoj glPqxrPRTFgG6Yzx7AXKpRc4xFJbPJV8ygIXBUlqG7K3+dS9GMu4/euW27eEFAxucWsA LP4BQTwVds9OXUkjtKYITMJERTzumL0MednzyqawbBgSsJROOlwTwIoFze6UFTQziMFl YO2w== X-Gm-Message-State: ALoCoQnv9xe5HTeh41ht3Kj0HGz3TCPYJx1vRM1HMggTb/tUQlv2eYwCNxRilT/WWRA0GVkIvtWv 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: 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