[PATCH 5/7] microblaze: Remove common.h usage

[Michal Simek]

On 10/13/23 01:03, Tom Rini wrote:
> We can remove common.h from most cases of the code here, and only a few
> places need an additional header instead.
> 
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
> Cc: Michal Simek <michal.simek at amd.com>
> ---
>   arch/microblaze/cpu/cache.c                          | 1 -
>   arch/microblaze/cpu/cpuinfo.c                        | 1 -
>   arch/microblaze/cpu/exception.c                      | 2 +-
>   arch/microblaze/cpu/interrupts.c                     | 3 ++-
>   arch/microblaze/cpu/pvr.c                            | 1 -
>   arch/microblaze/cpu/relocate.c                       | 3 ++-
>   arch/microblaze/cpu/spl.c                            | 1 -
>   arch/microblaze/include/asm/cpuinfo.h                | 2 ++
>   arch/microblaze/lib/bootm.c                          | 1 -
>   board/xilinx/microblaze-generic/microblaze-generic.c | 1 -
>   10 files changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
> index 829e6c7ae605..75ec0a8fd24f 100644
> --- a/arch/microblaze/cpu/cache.c
> +++ b/arch/microblaze/cpu/cache.c
> @@ -5,7 +5,6 @@
>    * Michal SIMEK <monstr at monstr.eu>
>    */
>   
> -#include <common.h>
>   #include <cpu_func.h>
>   #include <asm/asm.h>
>   #include <asm/cache.h>
> diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c
> index 6b15d6ca41c0..2bfdf767f3a5 100644
> --- a/arch/microblaze/cpu/cpuinfo.c
> +++ b/arch/microblaze/cpu/cpuinfo.c
> @@ -2,7 +2,6 @@
>   /*
>    * Copyright (C) 2022, Ovidiu Panait <ovpanait at gmail.com>
>    */
> -#include <common.h>
>   #include <asm/cpuinfo.h>
>   #include <asm/global_data.h>
>   
> diff --git a/arch/microblaze/cpu/exception.c b/arch/microblaze/cpu/exception.c
> index 9414776afa7f..6b329fc7b3a2 100644
> --- a/arch/microblaze/cpu/exception.c
> +++ b/arch/microblaze/cpu/exception.c
> @@ -5,8 +5,8 @@
>    * Michal  SIMEK <monstr at monstr.eu>
>    */
>   
> -#include <common.h>
>   #include <hang.h>
> +#include <stdio.h>
>   #include <asm/asm.h>
>   
>   void _hw_exception_handler (void)
> diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
> index ac53208bda67..244f7fd15eba 100644
> --- a/arch/microblaze/cpu/interrupts.c
> +++ b/arch/microblaze/cpu/interrupts.c
> @@ -7,7 +7,8 @@
>    * Yasushi SHOJI <yashi at atmark-techno.com>
>    */
>   
> -#include <common.h>
> +#include <log.h>
> +#include <vsprintf.h>
>   #include <asm/asm.h>
>   
>   void enable_interrupts(void)
> diff --git a/arch/microblaze/cpu/pvr.c b/arch/microblaze/cpu/pvr.c
> index 23c0f912d435..71aea0b9380c 100644
> --- a/arch/microblaze/cpu/pvr.c
> +++ b/arch/microblaze/cpu/pvr.c
> @@ -2,7 +2,6 @@
>   /*
>    * Copyright (C) 2022, Ovidiu Panait <ovpanait at gmail.com>
>    */
> -#include <common.h>
>   #include <asm/asm.h>
>   #include <asm/pvr.h>
>   
> diff --git a/arch/microblaze/cpu/relocate.c b/arch/microblaze/cpu/relocate.c
> index 7a15fb2ec397..e46fe5bdd5d7 100644
> --- a/arch/microblaze/cpu/relocate.c
> +++ b/arch/microblaze/cpu/relocate.c
> @@ -4,8 +4,9 @@
>    * Michal Simek <michal.simek at amd.com>
>    */
>   
> -#include <common.h>
>   #include <elf.h>
> +#include <log.h>
> +#include <linux/types.h>
>   
>   #define R_MICROBLAZE_NONE	0
>   #define R_MICROBLAZE_32		1
> diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
> index c21beafdb810..cb224bd25423 100644
> --- a/arch/microblaze/cpu/spl.c
> +++ b/arch/microblaze/cpu/spl.c
> @@ -5,7 +5,6 @@
>    * Michal Simek <michal.simek at amd.com>
>    */
>   
> -#include <common.h>
>   #include <command.h>
>   #include <image.h>
>   #include <log.h>
> diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h
> index 3c58e52217c4..fbd9418a2f8b 100644
> --- a/arch/microblaze/include/asm/cpuinfo.h
> +++ b/arch/microblaze/include/asm/cpuinfo.h
> @@ -6,6 +6,8 @@
>   #ifndef __ASM_MICROBLAZE_CPUINFO_H
>   #define __ASM_MICROBLAZE_CPUINFO_H
>   
> +#include <linux/types.h>
> +
>   /**
>    * struct microblaze_cpuinfo - CPU info for microblaze processor core.
>    *
> diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
> index 930384f4015f..f3ec4b741b88 100644
> --- a/arch/microblaze/lib/bootm.c
> +++ b/arch/microblaze/lib/bootm.c
> @@ -7,7 +7,6 @@
>    * Yasushi SHOJI <yashi at atmark-techno.com>
>    */
>   
> -#include <common.h>
>   #include <bootstage.h>
>   #include <command.h>
>   #include <cpu_func.h>
> diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
> index a427ac94a170..2b035d535892 100644
> --- a/board/xilinx/microblaze-generic/microblaze-generic.c
> +++ b/board/xilinx/microblaze-generic/microblaze-generic.c
> @@ -10,7 +10,6 @@
>    * header files
>    */
>   
> -#include <common.h>
>   #include <config.h>
>   #include <env.h>
>   #include <init.h>

I build it and no problem seen that's why.
Acked-by: Michal Simek <michal.simek at amd.com>

If you want me to take it via my tree please let me know but I expect you will 
take it directly.

Thanks,
Michal