From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: Michal Simek <michal.simek@amd.com>
Subject: [PATCH 5/7] microblaze: Remove common.h usage
Date: Thu, 12 Oct 2023 19:03:57 -0400 [thread overview]
Message-ID: <20231012230359.2005249-5-trini@konsulko.com> (raw)
In-Reply-To: <20231012230359.2005249-1-trini@konsulko.com>
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>
---
Cc: Michal Simek <michal.simek@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@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@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@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@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@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@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@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@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>
--
2.34.1
next prev parent reply other threads:[~2023-10-12 23:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 23:03 [PATCH 1/7] checkpatch.pl: Make common.h check boarder Tom Rini
2023-10-12 23:03 ` [PATCH 2/7] include: Add <linux/types.h> in a few places Tom Rini
2023-10-13 15:14 ` Simon Glass
2023-10-24 23:15 ` Tom Rini
2023-10-12 23:03 ` [PATCH 3/7] arc: Remove common.h usage Tom Rini
2023-10-13 9:21 ` Alexey Brodkin
2023-10-24 23:15 ` Tom Rini
2023-10-12 23:03 ` [PATCH 4/7] m68k: " Tom Rini
2023-10-13 15:14 ` Simon Glass
2023-10-13 15:17 ` Tom Rini
2023-10-13 16:57 ` Simon Glass
2023-10-13 20:53 ` Angelo Dureghello
2023-10-13 20:55 ` Tom Rini
2023-10-13 21:40 ` Angelo Dureghello
2023-10-24 23:16 ` Tom Rini
2023-10-12 23:03 ` Tom Rini [this message]
2023-10-13 7:11 ` [PATCH 5/7] microblaze: " Michal Simek
2023-10-24 23:16 ` Tom Rini
2023-10-12 23:03 ` [PATCH 6/7] mips: " Tom Rini
2023-10-24 23:16 ` Tom Rini
2023-10-12 23:03 ` [PATCH 7/7] riscv: " Tom Rini
[not found] ` <SEZPR03MB8064C345D63766D2E86B2184C1D2A@SEZPR03MB8064.apcprd03.prod.outlook.com>
2023-10-13 8:52 ` Rick Chen
2023-10-24 23:16 ` Tom Rini
2023-10-13 15:15 ` [PATCH 1/7] checkpatch.pl: Make common.h check boarder Simon Glass
2023-10-13 15:16 ` Tom Rini
2023-10-13 15:49 ` Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231012230359.2005249-5-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=michal.simek@amd.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox