diff mbox

[[PATCH,flasher] 2/6] Separate out validation of config name

Message ID 1371079807-16541-2-git-send-email-swarren@wwwdotorg.org
State Not Applicable, archived
Headers show

Commit Message

Stephen Warren June 12, 2013, 11:30 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

This function will be used by multiple sub-commands in the future.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 tegra-uboot-flasher | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Comments

Thierry Reding June 13, 2013, 6:36 p.m. UTC | #1 
On Wed, Jun 12, 2013 at 05:30:03PM -0600, Stephen Warren wrote:
[...]
> diff --git a/tegra-uboot-flasher b/tegra-uboot-flasher
> index 447ff37..ef73e2f 100755
> --- a/tegra-uboot-flasher
> +++ b/tegra-uboot-flasher
> @@ -75,6 +75,17 @@ gen_flashcmds = {
>      'spi': gen_flashcmd_spi,
>  }
>  
> +def find_config_dir():
> +    if not configs.has_key(args.configname):
> +        print 'Unknown config "%s"' % args.configname
> +        sys.exit(1)
> +
> +    global boardname, socname, out_board_dir

Python supports returning touples, so maybe globals can be avoided here?

> +
> +    boardname = configs[args.configname]['board']
> +    socname = boards[boardname]['soc']
> +    out_board_dir = os.path.join(args.data_dir, boardname)
> +
>  parser = argparse.ArgumentParser(description='Write an image to a Tegra board\'s flash')
>  parser.add_argument('--debug', action='store_true',
>                     help='Turn on debugging prints')
> @@ -122,14 +133,7 @@ if args.list_confignames:
>          print configname
>      sys.exit(0)
>  
> -if not configs.has_key(args.configname):
> -    print 'Unknown config "%s"' % args.configname
> -    sys.exit(1)
> -
> -boardname = configs[args.configname]['board']
> -socname = boards[boardname]['soc']
> -
> -out_board_dir = os.path.join(args.data_dir, boardname)
> +find_config_dir()

So this'll turn into something like:

	boardname, socname, out_board_dir = find_config_dir()

Thierry
diff mbox

Patch

diff --git a/tegra-uboot-flasher b/tegra-uboot-flasher
index 447ff37..ef73e2f 100755
--- a/tegra-uboot-flasher
+++ b/tegra-uboot-flasher
@@ -75,6 +75,17 @@  gen_flashcmds = {
     'spi': gen_flashcmd_spi,
 }
 
+def find_config_dir():
+    if not configs.has_key(args.configname):
+        print 'Unknown config "%s"' % args.configname
+        sys.exit(1)
+
+    global boardname, socname, out_board_dir
+
+    boardname = configs[args.configname]['board']
+    socname = boards[boardname]['soc']
+    out_board_dir = os.path.join(args.data_dir, boardname)
+
 parser = argparse.ArgumentParser(description='Write an image to a Tegra board\'s flash')
 parser.add_argument('--debug', action='store_true',
                    help='Turn on debugging prints')
@@ -122,14 +133,7 @@  if args.list_confignames:
         print configname
     sys.exit(0)
 
-if not configs.has_key(args.configname):
-    print 'Unknown config "%s"' % args.configname
-    sys.exit(1)
-
-boardname = configs[args.configname]['board']
-socname = boards[boardname]['soc']
-
-out_board_dir = os.path.join(args.data_dir, boardname)
+find_config_dir()
 
 u_boot_no_dtb = os.path.join(out_board_dir, 'u-boot-nodtb-tegra.bin')
 u_boot_no_dtb_size = os.path.getsize(u_boot_no_dtb)