[tegra-uboot-scripts] Use full U-Boot command names in all cases

Submitted by Stephen Warren on Oct. 6, 2016, 5:18 p.m.

Details

Message ID 20161006171844.23031-1-swarren@wwwdotorg.org
State New
Headers show

Commit Message

Stephen Warren Oct. 6, 2016, 5:18 p.m.
From: Stephen Warren <swarren@nvidia.com>

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 <aplattner@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
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(-)

Comments

Aaron Plattner Oct. 6, 2016, 5:23 p.m.
On 10/06/2016 10:18 AM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> 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 <aplattner@nvidia.com>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Note that I haven't tested this; if you could that'd be great.

This is identical to what I applied locally, so
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Tested-by: Aaron Plattner <aplattner@nvidia.com>

> 
>  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:
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Warren Oct. 6, 2016, 5:27 p.m.
On 10/06/2016 11:23 AM, Aaron Plattner wrote:
> On 10/06/2016 10:18 AM, Stephen Warren wrote:
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> 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 <aplattner@nvidia.com>
>> Signed-off-by: Stephen Warren <swarren@nvidia.com>
>> ---
>> Note that I haven't tested this; if you could that'd be great.
>
> This is identical to what I applied locally, so
> Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
> Tested-by: Aaron Plattner <aplattner@nvidia.com>

Thanks. Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

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: