From patchwork Tue Sep 29 15:47:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54243 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by patches.linaro.org (Postfix) with ESMTPS id 6980122EAF for ; Tue, 29 Sep 2015 15:49:29 +0000 (UTC) Received: by ykdg206 with SMTP id g206sf12053229ykd.1 for ; Tue, 29 Sep 2015 08:49:29 -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=p8uFfh4dtcBqaas7NsGriiaOo99Uw6E750PBP/nR1qA=; b=dzVqq9BjVcLqXK85HCsp2xyhYTX0B/PD1Dt+rbsFjC7bZDGvexmdKihWuM5TSJuqhW oKkxRd+ahpfVrinpq68lO4f7tXDK2nVFbJebvyKfbdKJ6qptFuRl7jbqHFILX9T+uAmd FlW3/Je3mZSs3+1eiKsxgjpZwJrIx2cH2va/xImJqhpdzAkTRS4MIxkZNaU1hD3RZwyg vYZsKMpyJmjbBPK6XcobJ8UPI335zvC1SHR1xsdr6DvH0a+8LvWsjWzrSPk3EYcYjJXe S+OV2qj6FO/tRpnHcBEbX5og5RyYb0iwL2vYM41KDzZ2j1bbfCXdnMS4bP/SpbBFHIVd MJ6A== X-Gm-Message-State: ALoCoQmb41zTWswng7QlMfq977pZaOQ4YjQi1z2A5EDowSrNLVdMgr3fT/bCk99/YHiF8BP5H/kB X-Received: by 10.112.138.170 with SMTP id qr10mr4495172lbb.4.1443541760513; Tue, 29 Sep 2015 08:49:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.166.200 with SMTP id p191ls394510lfe.37.gmail; Tue, 29 Sep 2015 08:49:19 -0700 (PDT) X-Received: by 10.25.20.37 with SMTP id k37mr4898194lfi.27.1443541759581; Tue, 29 Sep 2015 08:49:19 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id s3si11215204lae.143.2015.09.29.08.49.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 08:49:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lahh2 with SMTP id h2so14039156lah.0 for ; Tue, 29 Sep 2015 08:49:19 -0700 (PDT) X-Received: by 10.25.19.21 with SMTP id j21mr4906587lfi.106.1443541759284; Tue, 29 Sep 2015 08:49:19 -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.59.35 with SMTP id w3csp2224544lbq; Tue, 29 Sep 2015 08:49:17 -0700 (PDT) X-Received: by 10.180.109.135 with SMTP id hs7mr27212885wib.12.1443541757393; Tue, 29 Sep 2015 08:49:17 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id u4si30422072wjq.30.2015.09.29.08.49.17; Tue, 29 Sep 2015 08:49:17 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id EA3064B8FE; Tue, 29 Sep 2015 17:48:51 +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 kzZV_aqK32PF; Tue, 29 Sep 2015 17:48:51 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 39C574B92C; Tue, 29 Sep 2015 17:48:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 461BE4B8E2 for ; Tue, 29 Sep 2015 17:47:52 +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 ZdLMSPqSarnk for ; Tue, 29 Sep 2015 17:47:52 +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-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by theia.denx.de (Postfix) with ESMTPS id 975834B8D1 for ; Tue, 29 Sep 2015 17:47:45 +0200 (CEST) Received: by wiclk2 with SMTP id lk2so22494428wic.1 for ; Tue, 29 Sep 2015 08:47:45 -0700 (PDT) X-Received: by 10.194.19.169 with SMTP id g9mr28275363wje.64.1443541664936; Tue, 29 Sep 2015 08:47:44 -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 kb9sm24555824wjb.49.2015.09.29.08.47.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 08:47:44 -0700 (PDT) From: Ryan Harkin To: ryan.harkin@linaro.org, u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 29 Sep 2015 16:47:19 +0100 Message-Id: <1443541640-7810-10-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> References: <1443541640-7810-1-git-send-email-ryan.harkin@linaro.org> Cc: Steve Rae Subject: [U-Boot] [PATCH v2 09/10] vexpress64: juno: add alternate kernel and device tree filenames 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: ryan.harkin@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.51 as permitted sender) smtp.mailfrom=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 The default Juno firmware has renamed the kernel and device tree filenames to norkern and board.dtb. Rather than change the default configuration to use the new names, breaking those with the old firmware, attempt to load the existing filename first. If that fails, attempt to load the alternate filename. I've echo'd that we are loading the alternate file to counter the output from "afs load" when the first load attempt fails. For example, I see this output on my Juno board: image "Image" not found in flash Loading norkern instead of Image loaded region 0 from 08500000 to 80000000, 00AB6318 bytes image "juno" not found in flash Loading board.dtb instead of juno loaded region 0 from 0A000000 to 83000000, 00003188 bytes Signed-off-by: Ryan Harkin Reviewed-by: Linus Walleij --- include/configs/vexpress_aemv8a.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 99dd8b6..259f6ac 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -187,11 +187,13 @@ * be copied into DRAM */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_name=Image\0" \ + "kernel_name=norkern\0" \ + "kernel_alt_name=Image\0" \ "kernel_addr=0x80000000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x84000000\0" \ - "fdt_name=juno\0" \ + "fdt_name=board.dtb\0" \ + "fdt_alt_name=juno\0" \ "fdt_addr=0x83000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ @@ -207,7 +209,17 @@ /* Copy the kernel and FDT to DRAM memory and boot */ #define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr} ; " \ + "if test $? -eq 1; then "\ + " echo Loading ${kernel_alt_name} instead of "\ + "${kernel_name}; "\ + " afs load ${kernel_alt_name} ${kernel_addr};"\ + "fi ; "\ "afs load ${fdt_name} ${fdt_addr} ; " \ + "if test $? -eq 1; then "\ + " echo Loading ${fdt_alt_name} instead of "\ + "${fdt_name}; "\ + " afs load ${fdt_alt_name} ${fdt_addr}; "\ + "fi ; "\ "fdt addr ${fdt_addr}; fdt resize; " \ "if afs load ${initrd_name} ${initrd_addr} ; "\ "then "\