From patchwork Sat Jul 16 15:51:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Pretzsch X-Patchwork-Id: 104980 X-Patchwork-Delegate: wd@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 7E511B6F7B for ; Sun, 17 Jul 2011 01:52:11 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5659728091; Sat, 16 Jul 2011 17:51:59 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 vgwtpbNzQ0T3; Sat, 16 Jul 2011 17:51:59 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 124FE280A4; Sat, 16 Jul 2011 17:51:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9A6DA28081 for ; Sat, 16 Jul 2011 17:51:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 hMaiKpJTIYxG for ; Sat, 16 Jul 2011 17:51:48 +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.mars-solutions.de (mars-solutions.de [213.239.212.107]) by theia.denx.de (Postfix) with ESMTP id 21D762809B for ; Sat, 16 Jul 2011 17:51:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.mars-solutions.de (Postfix) with ESMTP id 1B89FA040E7 for ; Sat, 16 Jul 2011 17:50:04 +0200 (CEST) Received: from mail.mars-solutions.de ([127.0.0.1]) by localhost (mars-solutions.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qVKhreiUhuAH for ; Sat, 16 Jul 2011 17:49:57 +0200 (CEST) Received: by mail.mars-solutions.de (Postfix, from userid 1036) id A31B0A04103; Sat, 16 Jul 2011 17:49:57 +0200 (CEST) Received: from ws-apr.office.loc (HSI-KBW-078-043-059-252.hsi4.kabel-badenwuerttemberg.de [78.43.59.252]) by mail.mars-solutions.de (Postfix) with ESMTP id 398F6A040D0 for ; Sat, 16 Jul 2011 17:49:57 +0200 (CEST) Received: by ws-apr.office.loc (Postfix, from userid 1000) id 5804A276052; Sat, 16 Jul 2011 17:51:39 +0200 (CEST) From: Andreas Pretzsch To: u-boot@lists.denx.de Date: Sat, 16 Jul 2011 17:51:00 +0200 Message-Id: <1310831460-14450-3-git-send-email-apr@cn-eng.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1310831460-14450-1-git-send-email-apr@cn-eng.de> References: <1303246918-19921-1-git-send-email-apr@cn-eng.de> <1310831460-14450-1-git-send-email-apr@cn-eng.de> Cc: Andreas Pretzsch Subject: [U-Boot] [PATCH v2 2/2] add command fitupd to run an update from a FIT image X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Command calls update_tftp() analogous to automatic update described in doc/README.update. Usage: fitupd [addr] - run update from FIT image at addr or from tftp 'updatefile' Signed-off-by: Andreas Pretzsch --- Changes for v2: - void update_tftp() => int update_tftp(): return success/fail --- common/Makefile | 1 + common/cmd_fitupd.c | 36 ++++++++++++++++++++++++++++++++++++ doc/README.update | 5 +++++ 3 files changed, 42 insertions(+), 0 deletions(-) create mode 100644 common/cmd_fitupd.c diff --git a/common/Makefile b/common/Makefile index 224b7cc..e92ee5b 100644 --- a/common/Makefile +++ b/common/Makefile @@ -94,6 +94,7 @@ COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o +COBJS-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o ifdef CONFIG_FPGA COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o diff --git a/common/cmd_fitupd.c b/common/cmd_fitupd.c new file mode 100644 index 0000000..4d1192b --- /dev/null +++ b/common/cmd_fitupd.c @@ -0,0 +1,36 @@ +/* + * (C) Copyright 2011 + * Andreas Pretzsch, carpe noctem engineering, apr@cn-eng.de + * + * This file is released under the terms of GPL v2 and any later version. + * See the file COPYING in the root directory of the source tree for details. + */ + +#include +#include + +#if !defined(CONFIG_UPDATE_TFTP) +#error "CONFIG_UPDATE_TFTP required" +#endif + +extern int update_tftp(ulong addr); + +static int do_fitupd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + ulong addr = 0UL; + + if (argc > 2) + return cmd_usage(cmdtp); + + if (argc == 2) + addr = simple_strtoul(argv[1], NULL, 16); + + return update_tftp(addr); +} + +U_BOOT_CMD(fitupd, 2, 0, do_fitupd, + "update from FIT image", + "[addr]\n" + "\t- run update from FIT image at addr\n" + "\t or from tftp 'updatefile'" +); diff --git a/doc/README.update b/doc/README.update index 48f03b7..a7f4d9e 100644 --- a/doc/README.update +++ b/doc/README.update @@ -51,6 +51,11 @@ the mkimage tool. dtc tool with support for binary includes, e.g. in version to be prepared. Refer to the doc/uImage.FIT/ directory for more details on FIT images. +This mechanism can be also triggered by the commmand "fitupd". +If an optional, non-zero address is provided as argument, the TFTP transfer +is skipped and the image at this address is used. +The fitupd command is enabled by CONFIG_CMD_FITUPD. + Example .its files ------------------