From patchwork Sat Apr 4 23:48:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 46777 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 94132216D1 for ; Sat, 4 Apr 2015 23:49:02 +0000 (UTC) Received: by lbdc10 with SMTP id c10sf276914lbd.0 for ; Sat, 04 Apr 2015 16:49:00 -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=GbN9VcUVbmNJA3pCeruhc/xqG9D+APo8eJJAH4ofH68=; b=eLUduqsadDt6NkEPzSQvvjWldTtf9I1iJK2UyoS8ARv3ynWbts/WoUemMfgfh2EYYv B/8WsOtiLUCLA+AsUqHc6S1qGulsvHcb4MNilxDt+/iIKlTW83ichGxztkELhkrnBGtx k4VxxJTJfpkSLQgBRw9Y3gM27Y/VFd3KBgC9RhDbvITlCJlVFojhivQHS0cZ1JBU1a2P 4PN8bMEF5RUv18OnpWxDz44ray6BfwX4OqJsL7DGCWeFJ0QFa9vrSTFCtT9P7FkgvN8J W/XVgWSSeFRjdTMrnC7KXjdGzKpo+9wYe+cp09jfBlDjVcTcSsAzESHKEBV2B8piHNUY GtAQ== X-Gm-Message-State: ALoCoQnGEYxgOvsOV2JsLDIxdHqoKcwCH7N9TWX6HcFUAhHOso5MvxLxzU5YBs6JwqtnRBEEUZmL X-Received: by 10.112.26.5 with SMTP id h5mr842846lbg.4.1428191340666; Sat, 04 Apr 2015 16:49:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.1 with SMTP id n1ls239796laa.87.gmail; Sat, 04 Apr 2015 16:49:00 -0700 (PDT) X-Received: by 10.152.26.169 with SMTP id m9mr7770681lag.45.1428191340393; Sat, 04 Apr 2015 16:49:00 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id or2si90538lac.40.2015.04.04.16.49.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Apr 2015 16:49:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbdc10 with SMTP id c10so1024390lbd.2 for ; Sat, 04 Apr 2015 16:49:00 -0700 (PDT) X-Received: by 10.112.184.70 with SMTP id es6mr7616152lbc.117.1428191340296; Sat, 04 Apr 2015 16:49:00 -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.57.201 with SMTP id k9csp2637177lbq; Sat, 4 Apr 2015 16:48:59 -0700 (PDT) X-Received: by 10.180.214.99 with SMTP id nz3mr18158891wic.82.1428191339593; Sat, 04 Apr 2015 16:48:59 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id u4si280140wix.60.2015.04.04.16.48.58; Sat, 04 Apr 2015 16:48:59 -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 7AC92392B; Sun, 5 Apr 2015 01:48:53 +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 ifFs7fRwYzOK; Sun, 5 Apr 2015 01:48:53 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 65D6F3931; Sun, 5 Apr 2015 01:48:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DBA0E392A for ; Sun, 5 Apr 2015 01:48:47 +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 8VclO8x3PebX for ; Sun, 5 Apr 2015 01:48:47 +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-la0-f45.google.com (mail-la0-f45.google.com [209.85.215.45]) by theia.denx.de (Postfix) with ESMTPS id 59C95B37B1 for ; Sun, 5 Apr 2015 01:48:43 +0200 (CEST) Received: by lahf3 with SMTP id f3so1048570lah.2 for ; Sat, 04 Apr 2015 16:48:43 -0700 (PDT) X-Received: by 10.112.218.67 with SMTP id pe3mr1088601lbc.53.1428191323434; Sat, 04 Apr 2015 16:48:43 -0700 (PDT) Received: from localhost.lan ([80.202.93.41]) by mx.google.com with ESMTPSA id lv10sm20262lac.24.2015.04.04.16.48.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Apr 2015 16:48:42 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Sun, 5 Apr 2015 01:48:32 +0200 Message-Id: <1428191313-3945-2-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1428191313-3945-1-git-send-email-linus.walleij@linaro.org> References: <1428191313-3945-1-git-send-email-linus.walleij@linaro.org> Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 2/3 v2] 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.176 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. Reviewed-by: Tom Rini Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase on the upstream baseline - Add Tom's ACK --- include/configs/vexpress_aemv8a.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 9ddb594f9c54..3fda20a8f6c8 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -198,7 +198,34 @@ #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=0x80000000\0" \ @@ -246,6 +273,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