diff mbox series

[v2,05/28] image: remove redundant hash includes

Message ID 20240507175132.1456512-6-raymond.mao@linaro.org
State RFC
Delegated to: Tom Rini
Headers show
Series Integrate MbedTLS v3.6 LTS with U-Boot | expand

Commit Message

Raymond Mao May 7, 2024, 5:50 p.m. UTC 
Remove the redundant includes of u-boot/md5.h, u-boot/sha1.h,
u-boot/sha256.h and u-boot/sha512.h

Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
---
Changes in v2
- None.

 boot/image-fit.c | 4 ----
 boot/image.c     | 2 --
 2 files changed, 6 deletions(-)

Comments

Tom Rini May 7, 2024, 9:23 p.m. UTC | #1 
On Tue, May 07, 2024 at 10:50:47AM -0700, Raymond Mao wrote:

> Remove the redundant includes of u-boot/md5.h, u-boot/sha1.h,
> u-boot/sha256.h and u-boot/sha512.h
> 
> Signed-off-by: Raymond Mao <raymond.mao@linaro.org>

Reviewed-by: Tom Rini <trini@konsulko.com>
Igor Opaniuk May 7, 2024, 10:57 p.m. UTC | #2 
On Tue, May 7, 2024 at 7:54 PM Raymond Mao <raymond.mao@linaro.org> wrote:
>
> Remove the redundant includes of u-boot/md5.h, u-boot/sha1.h,
> u-boot/sha256.h and u-boot/sha512.h
>
> Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
> ---
> Changes in v2
> - None.
>
>  boot/image-fit.c | 4 ----
>  boot/image.c     | 2 --
>  2 files changed, 6 deletions(-)
>
> diff --git a/boot/image-fit.c b/boot/image-fit.c
> index 89e377563ce..1efc39f4408 100644
> --- a/boot/image-fit.c
> +++ b/boot/image-fit.c
> @@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  #include <image.h>
>  #include <bootstage.h>
>  #include <u-boot/crc.h>
> -#include <u-boot/md5.h>
> -#include <u-boot/sha1.h>
> -#include <u-boot/sha256.h>
> -#include <u-boot/sha512.h>
>
>  /*****************************************************************************/
>  /* New uImage format routines */
> diff --git a/boot/image.c b/boot/image.c
> index 073931cd7a3..e57d6eae52d 100644
> --- a/boot/image.c
> +++ b/boot/image.c
> @@ -26,8 +26,6 @@
>  #endif
>
>  #include <asm/global_data.h>
> -#include <u-boot/md5.h>
> -#include <u-boot/sha1.h>
>  #include <linux/errno.h>
>  #include <asm/io.h>
>
> --
> 2.25.1
>
Reviewed-by: Igor Opaniuk <igor.opaniuk@gmail.com>
Ilias Apalodimas May 8, 2024, 10:13 a.m. UTC | #3 
On Tue, 7 May 2024 at 20:54, Raymond Mao <raymond.mao@linaro.org> wrote:
>
> Remove the redundant includes of u-boot/md5.h, u-boot/sha1.h,
> u-boot/sha256.h and u-boot/sha512.h
>
> Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
> ---
> Changes in v2
> - None.
>
>  boot/image-fit.c | 4 ----
>  boot/image.c     | 2 --
>  2 files changed, 6 deletions(-)
>
> diff --git a/boot/image-fit.c b/boot/image-fit.c
> index 89e377563ce..1efc39f4408 100644
> --- a/boot/image-fit.c
> +++ b/boot/image-fit.c
> @@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  #include <image.h>
>  #include <bootstage.h>
>  #include <u-boot/crc.h>
> -#include <u-boot/md5.h>
> -#include <u-boot/sha1.h>
> -#include <u-boot/sha256.h>
> -#include <u-boot/sha512.h>
>
>  /*****************************************************************************/
>  /* New uImage format routines */
> diff --git a/boot/image.c b/boot/image.c
> index 073931cd7a3..e57d6eae52d 100644
> --- a/boot/image.c
> +++ b/boot/image.c
> @@ -26,8 +26,6 @@
>  #endif
>
>  #include <asm/global_data.h>
> -#include <u-boot/md5.h>
> -#include <u-boot/sha1.h>
>  #include <linux/errno.h>
>  #include <asm/io.h>
>
> --
> 2.25.1
>

This seems unrelated to the series of mbedTLS. Can you send a series
with the fixes independently? Tom can pick them up before mbedTLS and
it would make the review process easier


Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Raymond Mao May 8, 2024, 3:14 p.m. UTC | #4 
Hi Ilias,

On Wed, 8 May 2024 at 06:14, Ilias Apalodimas <ilias.apalodimas@linaro.org>
wrote:

> On Tue, 7 May 2024 at 20:54, Raymond Mao <raymond.mao@linaro.org> wrote:
> >
> > Remove the redundant includes of u-boot/md5.h, u-boot/sha1.h,
> > u-boot/sha256.h and u-boot/sha512.h
> >
> > Signed-off-by: Raymond Mao <raymond.mao@linaro.org>
> > ---
> > Changes in v2
> > - None.
> >
> >  boot/image-fit.c | 4 ----
> >  boot/image.c     | 2 --
> >  2 files changed, 6 deletions(-)
> >
> > diff --git a/boot/image-fit.c b/boot/image-fit.c
> > index 89e377563ce..1efc39f4408 100644
> > --- a/boot/image-fit.c
> > +++ b/boot/image-fit.c
> > @@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR;
> >  #include <image.h>
> >  #include <bootstage.h>
> >  #include <u-boot/crc.h>
> > -#include <u-boot/md5.h>
> > -#include <u-boot/sha1.h>
> > -#include <u-boot/sha256.h>
> > -#include <u-boot/sha512.h>
> >
> >
> /*****************************************************************************/
> >  /* New uImage format routines */
> > diff --git a/boot/image.c b/boot/image.c
> > index 073931cd7a3..e57d6eae52d 100644
> > --- a/boot/image.c
> > +++ b/boot/image.c
> > @@ -26,8 +26,6 @@
> >  #endif
> >
> >  #include <asm/global_data.h>
> > -#include <u-boot/md5.h>
> > -#include <u-boot/sha1.h>
> >  #include <linux/errno.h>
> >  #include <asm/io.h>
> >
> > --
> > 2.25.1
> >
>
> This seems unrelated to the series of mbedTLS. Can you send a series
> with the fixes independently? Tom can pick them up before mbedTLS and
> it would make the review process easier
>
> I can send this in a new prerequisite series.

Regards,
Raymond


> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
>
diff mbox series

Patch

diff --git a/boot/image-fit.c b/boot/image-fit.c
index 89e377563ce..1efc39f4408 100644
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -38,10 +38,6 @@  DECLARE_GLOBAL_DATA_PTR;
 #include <image.h>
 #include <bootstage.h>
 #include <u-boot/crc.h>
-#include <u-boot/md5.h>
-#include <u-boot/sha1.h>
-#include <u-boot/sha256.h>
-#include <u-boot/sha512.h>
 
 /*****************************************************************************/
 /* New uImage format routines */
diff --git a/boot/image.c b/boot/image.c
index 073931cd7a3..e57d6eae52d 100644
--- a/boot/image.c
+++ b/boot/image.c
@@ -26,8 +26,6 @@ 
 #endif
 
 #include <asm/global_data.h>
-#include <u-boot/md5.h>
-#include <u-boot/sha1.h>
 #include <linux/errno.h>
 #include <asm/io.h>