[U-Boot] [PATCH v2 11/14] sparse: Rename the file and header

Maxime Ripard maxime.ripard at free-electrons.com
Thu Oct 15 14:34:19 CEST 2015


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 at free-electrons.com>
---
 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 <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 57cbde078340..9ca8602a73ec 100644
--- 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 6d76c1e758f9..dffe844d548a 100644
--- 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
-- 
2.5.3



More information about the U-Boot mailing list