[PATCH] tools: mksunxiboot: Use sunxi_image header directly

[PATCH] tools: mksunxiboot: Use sunxi_image header directly

[Samuel Holland]

When adding eGON support to mkimage, the struct boot_file_head
definition was moved to its own header. This is the only thing
mksunxiboot needed out of asm/arch/spl.h. Clean up the relative
include by switching to new header.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---
We switched from using mksunxiboot to mkimage in January, so maybe
it is about time to consider dropping this tool?

 tools/mksunxiboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c
index a18c9d98bc..becc36565b 100644
--- a/tools/mksunxiboot.c
+++ b/tools/mksunxiboot.c
@@ -12,10 +12,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <sunxi_image.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "imagetool.h"
-#include "../arch/arm/include/asm/arch-sunxi/spl.h"
 
 #define STAMP_VALUE                     0x5F0A6C39
 
-- 
2.32.0

Re: [PATCH] tools: mksunxiboot: Use sunxi_image header directly

[Andre Przywara]

On Tue, 12 Oct 2021 19:35:41 -0500
Samuel Holland <samuel@sholland.org> wrote:

> When adding eGON support to mkimage, the struct boot_file_head
> definition was moved to its own header. This is the only thing
> mksunxiboot needed out of asm/arch/spl.h. Clean up the relative
> include by switching to new header.
> 
> Signed-off-by: Samuel Holland <samuel@sholland.org>

Reviewed-by: Andre Przywara <andre.przywara@arm.com>

> ---
> We switched from using mksunxiboot to mkimage in January, so maybe
> it is about time to consider dropping this tool?

Well, is there a reason to remove it? Otherwise I don't see a problem
to keep it around for a while, 9 months is not a terribly long time for
some people.

Cheers,
Andre.

> 
>  tools/mksunxiboot.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c
> index a18c9d98bc..becc36565b 100644
> --- a/tools/mksunxiboot.c
> +++ b/tools/mksunxiboot.c
> @@ -12,10 +12,10 @@
>  #include <stdlib.h>
>  #include <string.h>
>  #include <errno.h>
> +#include <sunxi_image.h>
>  #include <sys/types.h>
>  #include <sys/stat.h>
>  #include "imagetool.h"
> -#include "../arch/arm/include/asm/arch-sunxi/spl.h"
>  
>  #define STAMP_VALUE                     0x5F0A6C39
>  

Re: [PATCH] tools: mksunxiboot: Use sunxi_image header directly

[Samuel Holland]

On 10/13/21 7:19 PM, Andre Przywara wrote:
> On Tue, 12 Oct 2021 19:35:41 -0500
> Samuel Holland <samuel@sholland.org> wrote:
> 
>> When adding eGON support to mkimage, the struct boot_file_head
>> definition was moved to its own header. This is the only thing
>> mksunxiboot needed out of asm/arch/spl.h. Clean up the relative
>> include by switching to new header.
>>
>> Signed-off-by: Samuel Holland <samuel@sholland.org>
> 
> Reviewed-by: Andre Przywara <andre.przywara@arm.com>
> 
>> ---
>> We switched from using mksunxiboot to mkimage in January, so maybe
>> it is about time to consider dropping this tool?
> 
> Well, is there a reason to remove it? Otherwise I don't see a problem
> to keep it around for a while, 9 months is not a terribly long time for
> some people.

No, there's not a particular reason. I was reminded that this file still
exists because I tried refactoring some things to isolate SPL code, and
I broke it. Now that it's fixed, leaving it is not too much trouble.

Regards,
Samuel