From patchwork Thu Oct 6 17:18:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 679017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sqfWb0llSz9s2Q for ; Fri, 7 Oct 2016 04:18:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942490AbcJFRSt (ORCPT ); Thu, 6 Oct 2016 13:18:49 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:56032 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S942442AbcJFRSt (ORCPT ); Thu, 6 Oct 2016 13:18:49 -0400 Received: from swarren-lx1.nvidia.com (thunderhill.nvidia.com [216.228.112.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPSA id 33E581C02D4; Thu, 6 Oct 2016 11:18:48 -0600 (MDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at avon.wwwdotorg.org From: Stephen Warren To: swarren@nvidia.com, aplattner@nvidia.com Cc: linux-tegra@vger.kernel.org Subject: [PATCH tegra-uboot-scripts] Use full U-Boot command names in all cases Date: Thu, 6 Oct 2016 11:18:44 -0600 Message-Id: <20161006171844.23031-1-swarren@wwwdotorg.org> X-Mailer: git-send-email 2.10.1 X-NVConfidentiality: public Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Stephen Warren The generated U-Boot script currently invokes "set" as a U-Boot command. This is intended to be an abbreviation for "setenv". This works fine when there are no other commands named "set*", but fails when there are. Use the full command name to avoid issues. Reported-by: Aaron Plattner Signed-off-by: Stephen Warren Reviewed-by: Aaron Plattner Tested-by: Aaron Plattner --- Note that I haven't tested this; if you could that'd be great. gen-uboot-script.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen-uboot-script.py b/gen-uboot-script.py index e11dbf15553c..6db377d96c07 100755 --- a/gen-uboot-script.py +++ b/gen-uboot-script.py @@ -132,13 +132,13 @@ else: f.write('''\ if test -n "${fdtfile}"; then - set _fdt ${fdtfile}; + setenv _fdt ${fdtfile}; else - set _fdt ${soc}-${board}${boardver}.dtb; + setenv _fdt ${soc}-${board}${boardver}.dtb; fi ''') f.write(load + ' ${fdt_addr_r} ' + args.dtbdir + '${_fdt}\n') -f.write('set _fdt\n') +f.write('setenv _fdt\n') bootargs = '' if not args.no_con_ttyS0: