From patchwork Mon Mar 16 12:23:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 45833 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0211021547 for ; Mon, 16 Mar 2015 12:24:28 +0000 (UTC) Received: by wggx13 with SMTP id x13sf26227275wgg.0 for ; Mon, 16 Mar 2015 05:24:27 -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=9Nk1IC8L5KGK5O95tzXL/bm3wh6CbHJXbBVVZb/ahIQ=; b=c5a084wa3krJqaaSfZvWyDA4uz+zR1SJWWS/NgpwUbHAxgBd5mHFq7cOMJeWp7k2ru 7kgV0rAv47ea+zUhfPkNPEi37tTaell++gpvSC7m0NsthVWNoLeoCLPs/iTsD9esQxM6 szxlcx4SyQGoS9q8SSAHEzGTvKxxmUTG14Gt52jh8kMvM+1gyDsvhDt01wiGA9nh1W84 2woQFeHSicxXjSsZrTqQ4azo3oneBbxAh0Zx7lrO5ReWUppL82zSE3A5MctY4jGSVsU2 NBBFhRUNElJy2b4udfBIL/SYxPTKbOe4GZp2ii8Zb0RYfF/4Hj6DIg2E9yfSjup+ACVc C+Sw== X-Gm-Message-State: ALoCoQnQIbBJrQtTGczm8en7l5jK43h4qVjTtfPpDttytmsjyMP3gwCR9x64BNMQp2qI60tCh789 X-Received: by 10.152.28.137 with SMTP id b9mr9142190lah.8.1426508667301; Mon, 16 Mar 2015 05:24:27 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.9 with SMTP id r9ls627576lae.75.gmail; Mon, 16 Mar 2015 05:24:26 -0700 (PDT) X-Received: by 10.112.62.135 with SMTP id y7mr54674698lbr.50.1426508666954; Mon, 16 Mar 2015 05:24:26 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id tl5si7993171lbb.96.2015.03.16.05.24.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:24:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbzq9 with SMTP id zq9so29371106lbb.0 for ; Mon, 16 Mar 2015 05:24:26 -0700 (PDT) X-Received: by 10.112.181.41 with SMTP id dt9mr56464399lbc.56.1426508666849; Mon, 16 Mar 2015 05:24:26 -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.35.133 with SMTP id h5csp2545602lbj; Mon, 16 Mar 2015 05:24:26 -0700 (PDT) X-Received: by 10.180.12.84 with SMTP id w20mr123450012wib.9.1426508665950; Mon, 16 Mar 2015 05:24:25 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id gu2si17574510wib.61.2015.03.16.05.24.25; Mon, 16 Mar 2015 05:24:25 -0700 (PDT) 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 264A74B639; Mon, 16 Mar 2015 13:24:24 +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 z5IFs7cnhhfm; Mon, 16 Mar 2015 13:24:23 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 944E24A04E; Mon, 16 Mar 2015 13:24:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F2D44A04C for ; Mon, 16 Mar 2015 13:24:21 +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 isGDKL2pQ0i7 for ; Mon, 16 Mar 2015 13:24:21 +0100 (CET) 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-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by theia.denx.de (Postfix) with ESMTPS id 06E634B639 for ; Mon, 16 Mar 2015 13:24:18 +0100 (CET) Received: by lbcds1 with SMTP id ds1so29349557lbc.3 for ; Mon, 16 Mar 2015 05:24:17 -0700 (PDT) X-Received: by 10.152.204.6 with SMTP id ku6mr9406639lac.62.1426508657657; Mon, 16 Mar 2015 05:24:17 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id je5sm2160799lac.33.2015.03.16.05.24.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 05:24:16 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Mon, 16 Mar 2015 13:23:52 +0100 Message-Id: <1426508633-10606-2-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1426508633-10606-1-git-send-email-linus.walleij@linaro.org> References: <1426508633-10606-1-git-send-email-linus.walleij@linaro.org> Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 2/3] 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.217.171 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 images stored 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 | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 810eef12deb1..e6fc2aeea2b8 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -198,14 +198,41 @@ #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=0x80000000\0" \ + "fdt_name=juno\0" \ + "fdt_addr=0x83000000\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 "afs load ${kernel_name} ${kernel_addr} ; " \ + "afs load ${fdt_name} ${fdt_addr} ; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "booti ${kernel_addr} - ${fdt_addr}" + +#define CONFIG_BOOTDELAY 1 + +#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_name=uImage\0" \ "kernel_addr_r=0x80000000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr_r=0x88000000\0" \ "fdt_name=devtree.dtb\0" \ - "fdt_addr_r=0x83000000\0" \ + "fdt_addr_r=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" @@ -253,6 +280,7 @@ #define CONFIG_SYS_NO_FLASH #else #define CONFIG_CMD_FLASH +#define CONFIG_CMD_ARMFLASH #define CONFIG_SYS_FLASH_CFI 1 #define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_SYS_FLASH_BASE 0x08000000