From patchwork Wed Jun 12 23:30:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 250927 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 A5FA32C0099 for ; Thu, 13 Jun 2013 09:30:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758091Ab3FLXaT (ORCPT ); Wed, 12 Jun 2013 19:30:19 -0400 Received: from avon.wwwdotorg.org ([70.85.31.133]:49579 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758149Ab3FLXaR (ORCPT ); Wed, 12 Jun 2013 19:30:17 -0400 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id 3BCF9635A; Wed, 12 Jun 2013 17:38:47 -0600 (MDT) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 78590E45FB; Wed, 12 Jun 2013 17:30:16 -0600 (MDT) From: Stephen Warren To: swarren@wwwdotorg.org Cc: linux-tegra@vger.kernel.org, Stephen Warren Subject: [[PATCH flasher] 4/6] Add parameters to gen_flashcmd_* Date: Wed, 12 Jun 2013 17:30:05 -0600 Message-Id: <1371079807-16541-4-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1371079807-16541-1-git-send-email-swarren@wwwdotorg.org> References: <1371079807-16541-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.7 at avon.wwwdotorg.org X-Virus-Status: Clean Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Stephen Warren This way, they don't rely on global variables, which won't be global once the flashing code is in a separate function. Signed-off-by: Stephen Warren --- tegra-uboot-flasher | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tegra-uboot-flasher b/tegra-uboot-flasher index 390ae0e..c4c42a1 100755 --- a/tegra-uboot-flasher +++ b/tegra-uboot-flasher @@ -51,19 +51,19 @@ def run(dir, cmd): raise Exception('Command failed: %d' % ret) os.chdir(oldcwd) -def gen_flashcmd_mmc(): +def gen_flashcmd_mmc(flash_image_addr, flash_img_size): flash_id = configs[args.configname]['flash-id-uboot'] flash_img_size_sectors = flash_img_size / 512 flashcmd = 'mmc dev %d 1 ; ' % flash_id flashcmd += 'mmc write 0x%08x 0 0x%x ; ' % (flash_image_addr, flash_img_size_sectors) return flashcmd -def gen_flashcmd_nand(): +def gen_flashcmd_nand(flash_image_addr, flash_img_size): flashcmd = 'nand erase.chip ; ' flashcmd += 'nand write 0x%08x 0 0x%08x ; ' % (flash_image_addr, flash_img_size) return flashcmd -def gen_flashcmd_spi(): +def gen_flashcmd_spi(flash_image_addr, flash_img_size): flashcmd = 'sf probe 0 ; ' flashcmd += 'sf erase 0 0x%08x ; ' % configs[args.configname]['flash-erase-size'] flashcmd += 'sf write 0x%08x 0 0x%08x ; ' % (flash_image_addr, flash_img_size) @@ -200,7 +200,7 @@ try: bootcmd = '' if args.debug: bootcmd = 'crc32 0x%08x 0x%08x ; ' % (flash_image_addr, flash_img_size) - bootcmd += gen_flashcmd() + bootcmd += gen_flashcmd(flash_image_addr, flash_img_size) bootcmd += 'env default -f -a ; ' # Perhaps U-Boot should set $boardname based on the ID EEPROM; then we wouldn't need this if configs[args.configname]['dtbfn-extra'] != '':