| Message ID | 1441032373-16992-10-git-send-email-maxime.ripard@free-electrons.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Aug 31, 2015 at 04:46:09PM +0200, Maxime Ripard wrote: > 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> In general, yes this is better so: Reviewed-by: Tom Rini <trini@konsulko.com> But I honestly thought you were messing with the Linux sparse stuff at first. So maybe common/image-spare.[ch] ?
On Fri, Sep 04, 2015 at 01:21:00PM -0400, Tom Rini wrote: > On Mon, Aug 31, 2015 at 04:46:09PM +0200, Maxime Ripard wrote: > > > 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> > > In general, yes this is better so: > > Reviewed-by: Tom Rini <trini@konsulko.com> > > But I honestly thought you were messing with the Linux sparse stuff at > first. So maybe common/image-spare.[ch] ? Ah, good point. Yes, I'll rename it :) Thanks! Maxime
diff --git a/common/Makefile b/common/Makefile index 20e8027a8913..f4c4cb623fc2 100644 --- a/common/Makefile +++ b/common/Makefile @@ -272,7 +272,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 += 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 0d6bcbf1f78b..eceedf1f1803 100644 --- a/common/fb_mmc.c +++ b/common/fb_mmc.c @@ -9,7 +9,7 @@ #include <fastboot.h> #include <fb_mmc.h> #include <part.h> -#include <aboot.h> +#include <sparse.h> #include <sparse_format.h> #include <mmc.h> diff --git a/common/fb_nand.c b/common/fb_nand.c index 1aab1e88f9c0..eb7ce4a35a43 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 <sparse.h> #include <sparse_format.h> #include <linux/mtd/mtd.h> diff --git a/common/aboot.c b/common/sparse.c similarity index 99% rename from common/aboot.c rename to common/sparse.c index 37ad50efc50a..74178f764b18 100644 --- a/common/aboot.c +++ b/common/sparse.c @@ -36,10 +36,10 @@ #include <config.h> #include <common.h> -#include <aboot.h> #include <errno.h> #include <malloc.h> #include <part.h> +#include <sparse.h> #include <sparse_format.h> typedef struct sparse_buffer { diff --git a/include/aboot.h b/include/sparse.h similarity index 100% rename from include/aboot.h rename to include/sparse.h
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> --- common/Makefile | 2 +- common/fb_mmc.c | 2 +- common/fb_nand.c | 2 +- common/{aboot.c => sparse.c} | 2 +- include/{aboot.h => sparse.h} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename common/{aboot.c => sparse.c} (99%) rename include/{aboot.h => sparse.h} (100%)