From patchwork Thu Oct 15 12:34:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 530654 X-Patchwork-Delegate: trini@ti.com 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 27F711400A0 for ; Thu, 15 Oct 2015 23:36:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0299F4B6DC; Thu, 15 Oct 2015 14:35:47 +0200 (CEST) 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 ASh5rv6iGQOs; Thu, 15 Oct 2015 14:35:46 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DD0264B72A; Thu, 15 Oct 2015 14:35:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0CC1E4B65F for ; Thu, 15 Oct 2015 14:34:35 +0200 (CEST) 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 tgb03rockjXY for ; Thu, 15 Oct 2015 14:34:34 +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.free-electrons.com (down.free-electrons.com [37.187.137.238]) by theia.denx.de (Postfix) with ESMTP id 40DD24B62B for ; Thu, 15 Oct 2015 14:34:33 +0200 (CEST) Received: by mail.free-electrons.com (Postfix, from userid 110) id 180AF42DC; Thu, 15 Oct 2015 14:34:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (AToulouse-657-1-26-161.w83-193.abo.wanadoo.fr [83.193.1.161]) by mail.free-electrons.com (Postfix) with ESMTPSA id D3F7D317B; Thu, 15 Oct 2015 14:34:32 +0200 (CEST) From: Maxime Ripard To: Hans de Goede , Ian Campbell , Marek Vasut , =?UTF-8?q?=C5=81ukasz=20Majewski?= Date: Thu, 15 Oct 2015 14:34:19 +0200 Message-Id: <1444912462-3949-12-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1444912462-3949-1-git-send-email-maxime.ripard@free-electrons.com> References: <1444912462-3949-1-git-send-email-maxime.ripard@free-electrons.com> Cc: Thomas Petazzoni , Tom Rini , u-boot@lists.denx.de, Alexander Kaplan Subject: [U-Boot] [PATCH v2 11/14] sparse: Rename the file and header X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The Android sparse image format is currently supported through a file called aboot, which isn't really such a great name, since the sparse image format is only used for transferring data with fastboot. Rename the file and header to a file called "sparse", which also makes it consistent with the header defining the image structures. Signed-off-by: Maxime Ripard Reviewed-by: Tom Rini --- common/Makefile | 2 +- common/fb_mmc.c | 2 +- common/fb_nand.c | 2 +- common/{aboot.c => image-sparse.c} | 2 +- include/{aboot.h => image-sparse.h} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename common/{aboot.c => image-sparse.c} (99%) rename include/{aboot.h => image-sparse.h} (100%) diff --git a/common/Makefile b/common/Makefile index 4f6e6cea596b..9398942932fd 100644 --- a/common/Makefile +++ b/common/Makefile @@ -275,7 +275,7 @@ obj-y += stdio.o # This option is not just y/n - it can have a numeric value ifdef CONFIG_FASTBOOT_FLASH -obj-y += aboot.o +obj-y += image-sparse.o ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV obj-y += fb_mmc.o endif diff --git a/common/fb_mmc.c b/common/fb_mmc.c index c6989668ae5b..e4fbd8dfa756 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -9,8 +9,8 @@ #include #include #include +#include #include -#include #include #include diff --git a/common/fb_nand.c b/common/fb_nand.c index 57cbde078340..9ca8602a73ec 100644 --- a/common/fb_nand.c +++ b/common/fb_nand.c @@ -8,8 +8,8 @@ #include #include -#include #include +#include #include #include diff --git a/common/aboot.c b/common/image-sparse.c similarity index 99% rename from common/aboot.c rename to common/image-sparse.c index 6d76c1e758f9..dffe844d548a 100644 --- a/common/aboot.c +++ b/common/image-sparse.c @@ -36,9 +36,9 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/include/aboot.h b/include/image-sparse.h similarity index 100% rename from include/aboot.h rename to include/image-sparse.h