microblaze: Remove common.h usage

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@konsulko.com>
Acked-by: Michal Simek <michal.simek@amd.com>

diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index 829e6c7ae60577e48c457f96d5483727170a9e53..75ec0a8fd24f440155c93af967f6af904ba16d8e 100644 (file)
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -5,7 +5,6 @@
  * Michal SIMEK <monstr@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 6b15d6ca41c0a20f676aeaad73891c31616905de..2bfdf767f3a5aca641934f935b73cff1d1c153da 100644 (file)
--- a/arch/microblaze/cpu/cpuinfo.c
+++ b/arch/microblaze/cpu/cpuinfo.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2022, Ovidiu Panait <ovpanait@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 9414776afa7fa37b5634dad4b9e4bf690e3f3fe9..6b329fc7b3a20a4157478609b724a487e89e5ad6 100644 (file)
--- a/arch/microblaze/cpu/exception.c
+++ b/arch/microblaze/cpu/exception.c
@@ -5,8 +5,8 @@
  * Michal  SIMEK <monstr@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 ac53208bda679b2b5e53c7b3c1c773b71723f1db..244f7fd15eba3d0350796de67c834becab2386ea 100644 (file)
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -7,7 +7,8 @@
  * Yasushi SHOJI <yashi@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 23c0f912d435a04ccd9d8ee4d8795de8dc951372..71aea0b9380cc6167009a6b49bfc528f2df79dd5 100644 (file)
--- a/arch/microblaze/cpu/pvr.c
+++ b/arch/microblaze/cpu/pvr.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2022, Ovidiu Panait <ovpanait@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 7a15fb2ec397b59a32ddf2fd855c1dbb79085429..e46fe5bdd5d74befb08f6442a0fe8aaf2f532e91 100644 (file)
--- a/arch/microblaze/cpu/relocate.c
+++ b/arch/microblaze/cpu/relocate.c
@@ -4,8 +4,9 @@
  * Michal Simek <michal.simek@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 c21beafdb810e36e450beebcc5d5a8cf007bc421..cb224bd254236202ed31f57f1decc33516cab56f 100644 (file)
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -5,7 +5,6 @@
  * Michal Simek <michal.simek@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 3c58e52217c4a351fa47275cb3934f4e3274ca2a..fbd9418a2f8b9dbd0007f89bcc877097c1c6312a 100644 (file)
--- 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 930384f4015f3f8cce05a70c10b25ecde1b351a8..f3ec4b741b8808e1d960062a72670b004b02673c 100644 (file)
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -7,7 +7,6 @@
  * Yasushi SHOJI <yashi@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 a427ac94a1703ee3478787a2df5a40ea60888a77..2b035d535892ece41972c656b719239f95fdaa65 100644 (file)
--- 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>