From patchwork Thu Oct 1 17:43:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 54396 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 4F31A23009 for ; Thu, 1 Oct 2015 17:45:27 +0000 (UTC) Received: by laak17 with SMTP id k17sf39708411laa.3 for ; Thu, 01 Oct 2015 10:45:25 -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=p7O4Z0GO3PQOH3wTEq6sorhfUXNIqRnMAyl0o0jXYMI=; b=bANn6W6h6Ncv1HHM9AlQeBCIcwORNvfHrnBi06KtUA2nDxeBPfBfwMmhJL4HavRheL DYNL1B0yxd8WZaWGKd/5pAV0iH2YipOnAZqRgSXhUF0qWFRj6c5w+1IP24o8H17ayj5e r6K9Wu3JdIkPlvmQ+8QGzysZMuqgtvrydzcXDqpZd6scNJAsMd5mopJo8SW97aKWk9gU c1pBjQO9/8HQl10Tsjg6Tlr3zkE6mQoWFw6qcRQlkwaAGy6GYH7fodzJ8Y42TpR22pSB qOwfNzfdJULaClXRr3Gap7+hSQC63593+KgPbD+o0CLlxi2SLpw91w8EGWG8UpP0jAki iUxw== X-Gm-Message-State: ALoCoQlsrM+BxYhYbF9cS3MQDaxwL14p9161x36pM9/Z/ITjR3bKJf/fpxmbsRxyr99Mt9Ny6iOU X-Received: by 10.194.109.233 with SMTP id hv9mr1673681wjb.1.1443721525775; Thu, 01 Oct 2015 10:45:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.90.68 with SMTP id o65ls139548lfb.4.gmail; Thu, 01 Oct 2015 10:45:25 -0700 (PDT) X-Received: by 10.112.159.168 with SMTP id xd8mr3436134lbb.118.1443721525620; Thu, 01 Oct 2015 10:45:25 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id d133si3445647lfd.46.2015.10.01.10.45.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Oct 2015 10:45:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by laer8 with SMTP id r8so79146846lae.2 for ; Thu, 01 Oct 2015 10:45:25 -0700 (PDT) X-Received: by 10.112.151.106 with SMTP id up10mr3454768lbb.106.1443721525442; Thu, 01 Oct 2015 10:45:25 -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 w3csp746810lbq; Thu, 1 Oct 2015 10:45:24 -0700 (PDT) X-Received: by 10.180.105.196 with SMTP id go4mr79382wib.36.1443721524780; Thu, 01 Oct 2015 10:45:24 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id gb8si8585490wjb.121.2015.10.01.10.45.24; Thu, 01 Oct 2015 10:45:24 -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 D19234B9D8; Thu, 1 Oct 2015 19:44:38 +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 bajTcPcuXsp0; Thu, 1 Oct 2015 19:44:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0279F4B9D5; Thu, 1 Oct 2015 19:44:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2EA3A4B9BA for ; Thu, 1 Oct 2015 19:44:05 +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 8eXSwQr2SSTO for ; Thu, 1 Oct 2015 19:44:05 +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 1818E4B998 for ; Thu, 1 Oct 2015 19:43:54 +0200 (CEST) Received: by wicfx3 with SMTP id fx3so118176wic.0 for ; Thu, 01 Oct 2015 10:43:54 -0700 (PDT) X-Received: by 10.180.8.68 with SMTP id p4mr91734wia.16.1443721434084; Thu, 01 Oct 2015 10:43:54 -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.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Oct 2015 10:43:53 -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:35 +0100 Message-Id: <1443721416-725-10-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 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.45 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 CC: David Feng CC: Bhupesh Sharma CC: 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 c62c3ac..192568a 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -185,11 +185,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" \ @@ -205,7 +207,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 "\