sparse: Rename the file and header

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 <maxime.ripard@free-electrons.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/common/Makefile b/common/Makefile
index 4c1b2f00abf0723344e9d69d83219eed6dde3c1f..d8dc892f721a842281b733274a42f027700bbd96 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -277,7 +277,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 c6989668ae5b914bdec8913654441b108ee02195..e4fbd8dfa7562749d306e45e2b9426328ecb57cc 100644 (file)
--- a/common/fb_mmc.c
+++ b/common/fb_mmc.c
@@ -9,8 +9,8 @@
 #include <errno.h>
 #include <fastboot.h>
 #include <fb_mmc.h>
+#include <image-sparse.h>
 #include <part.h>
-#include <aboot.h>
 #include <sparse_format.h>
 #include <mmc.h>
 

diff --git a/common/fb_nand.c b/common/fb_nand.c
index 57cbde078340be4c861bf12822605314beec3ecc..9ca8602a73ecbab5abdbf86cb6cd1dc1ec2b334e 100644 (file)
--- a/common/fb_nand.c
+++ b/common/fb_nand.c
@@ -8,8 +8,8 @@
 #include <config.h>
 #include <common.h>
 
-#include <aboot.h>
 #include <fastboot.h>
+#include <image-sparse.h>
 #include <sparse_format.h>
 
 #include <linux/mtd/mtd.h>

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 6d76c1e758f9a517cb1e09a5053244bbf55c2e4d..dffe844d548a81d9751991f53ba2da77f8142571 100644 (file)
--- a/common/aboot.c
+++ b/common/image-sparse.c
@@ -36,9 +36,9 @@
 
 #include <config.h>
 #include <common.h>
-#include <aboot.h>
 #include <div64.h>
 #include <errno.h>
+#include <image-sparse.h>
 #include <malloc.h>
 #include <part.h>
 #include <sparse_format.h>

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