From patchwork Thu Feb 19 16:19:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 44844 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 ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3447321554 for ; Thu, 19 Feb 2015 16:22:21 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id r20sf6301735wiv.3 for ; Thu, 19 Feb 2015 08:22:20 -0800 (PST) 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: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=9uf5VsfgMbhLZYj6bpB7PFiVrM8wTVi/O39XpkEg9fI=; b=W1uGXEbC1xx7kmT7/x/kkCjfWjpnHWRlAuFdimzEynxiGmitG9aHdeaALNId11knDN LPrHXIdBxzyW8wYIE9TQeaXKvAQd8UOaACJnzRyWbqZIiUxTEylNOOz3sqVsMT4FITLY 2lnoWHLWwh7he7WqCKxlayjQ45AB/uBoAJ0aLoganyr3uVs33TvJD/6Hp6Ikv54zAbpf CRWgPU8dpEOJ9SwjZPS+CvKJZtSKozTq3GgeWL3325rPymcAQRZZ5yj2pOjFfcvKmQz7 Rh0DfAOf35Oczv8ElDpdTNF/s4hbHLBj+cdmixdeAgWaSpy6CztL92A5G/I5oUSljKk8 fNmg== X-Gm-Message-State: ALoCoQn2L4/2pcau2idnzDREebmiPr3RZgxrx70msJWRVeOEGvTaGfqRzPH30kK0JulfGVY2r7aU X-Received: by 10.180.72.44 with SMTP id a12mr833379wiv.0.1424362940500; Thu, 19 Feb 2015 08:22:20 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.104 with SMTP id ln8ls162223lac.94.gmail; Thu, 19 Feb 2015 08:22:20 -0800 (PST) X-Received: by 10.112.17.67 with SMTP id m3mr4577765lbd.109.1424362940260; Thu, 19 Feb 2015 08:22:20 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id t1si15648710lat.87.2015.02.19.08.22.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Feb 2015 08:22:20 -0800 (PST) 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 labhs14 with SMTP id hs14so651946lab.1 for ; Thu, 19 Feb 2015 08:22:20 -0800 (PST) X-Received: by 10.112.42.225 with SMTP id r1mr1208446lbl.72.1424362940122; Thu, 19 Feb 2015 08:22:20 -0800 (PST) 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.35.133 with SMTP id h5csp595735lbj; Thu, 19 Feb 2015 08:22:18 -0800 (PST) X-Received: by 10.194.142.205 with SMTP id ry13mr10655023wjb.73.1424362938255; Thu, 19 Feb 2015 08:22:18 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id gm7si41653277wib.103.2015.02.19.08.22.17; Thu, 19 Feb 2015 08:22:18 -0800 (PST) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A39F04B7E7; Thu, 19 Feb 2015 17:20:51 +0100 (CET) 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 LIdSPhh2I9cA; Thu, 19 Feb 2015 17:20:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 35E134B7C7; Thu, 19 Feb 2015 17:20:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 62AA64B7AE for ; Thu, 19 Feb 2015 17:20:20 +0100 (CET) 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 jAoA6iY5b93C for ; Thu, 19 Feb 2015 17:20:20 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 IX_MANITU=ERR(0) (only DNSBL check requested) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com [209.85.217.169]) by theia.denx.de (Postfix) with ESMTPS id 284914B7AD for ; Thu, 19 Feb 2015 17:20:06 +0100 (CET) Received: by lbjb6 with SMTP id b6so859435lbj.2 for ; Thu, 19 Feb 2015 08:20:01 -0800 (PST) X-Received: by 10.112.235.10 with SMTP id ui10mr4680850lbc.77.1424362801163; Thu, 19 Feb 2015 08:20:01 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id i10sm4898529lah.25.2015.02.19.08.19.58 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Feb 2015 08:20:00 -0800 (PST) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Thu, 19 Feb 2015 17:19:54 +0100 Message-Id: <1424362794-31729-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 2/2] vexpress64: juno: add default NOR flash boot 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: linus.walleij@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.mail=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 This modifies the vexpress64 Juno configuration so that it will by default load and boot a kernel and a device tree from the pre-defined location in the NOR flash. When we are at it, also define the proper command line for the Juno and indicate that the USB stick (/dev/sda1) is the default root file system. Signed-off-by: Linus Walleij --- include/configs/vexpress_aemv8a.h | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index bcfcb63d81d8..7a6ac9bb9b3a 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -190,7 +190,38 @@ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 /* Initial environment variables */ -#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +/* + * Defines where the kernel and FDT exist in NOR flash and where it will + * be copied into DRAM + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ + "kernel_addr=0x8500000\0" \ + "kernel_addr_r=0x80000000\0" \ + "max_kernel=0xa00000\0" \ + "fdt_name=juno.dtb\0" \ + "fdt_addr=0x8f00000\0" \ + "fdt_addr_r=0x83000000\0" \ + "max_fdt=0x100000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" \ + +/* Assume we boot with root on the first partition of a USB stick */ +#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \ + "root=/dev/sda1 rw " \ + "earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\ + "loglevel=9" + +/* Copy the kernel and FDT to DRAM memory and boot */ +#define CONFIG_BOOTCOMMAND "cp ${kernel_addr} ${kernel_addr_r} ${max_kernel} ; " \ + "cp ${fdt_addr} ${fdt_addr_r} ${max_fdt}; " \ + "fdt addr $fdt_addr_r; fdt resize; " \ + "booti $kernel_addr_r - $fdt_addr_r" + +#define CONFIG_BOOTDELAY 1 + +#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=uImage\0" \ "kernel_addr_r=0x80000000\0" \