aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/lib
diff options
context:
space:
mode:
authorTom Rini2021-02-15 08:19:40 -0500
committerTom Rini2021-02-15 10:16:45 -0500
commit2ae80437fbe0181184ae4b188b89629b902702c6 (patch)
tree846f70a5df9c80ef76284c39f0da58b8c3eba96f /arch/powerpc/lib
parent76b7936e6f781c86b0d3159f67f1506d01c196ce (diff)
parent401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff)
Merge branch '2021-02-02-drop-asm_global_data-when-unused'
- Merge the patch to take <asm/global_data.h> out of <common.h>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r--arch/powerpc/lib/bat_rw.c1
-rw-r--r--arch/powerpc/lib/bdinfo.c1
-rw-r--r--arch/powerpc/lib/bootm.c1
-rw-r--r--arch/powerpc/lib/stack.c1
-rw-r--r--arch/powerpc/lib/traps.c2
5 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/lib/bat_rw.c b/arch/powerpc/lib/bat_rw.c
index ac56e3aeddb..24dd30615bd 100644
--- a/arch/powerpc/lib/bat_rw.c
+++ b/arch/powerpc/lib/bat_rw.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <asm/global_data.h>
#include <asm/processor.h>
#include <asm/mmu.h>
#include <asm/io.h>
diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index b14e75b68ab..d2e5e6057b3 100644
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <init.h>
+#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index b903e6ec8dc..31c17b5bb38 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -18,6 +18,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
+#include <asm/global_data.h>
#include <u-boot/zlib.h>
#include <bzlib.h>
#include <asm/byteorder.h>
diff --git a/arch/powerpc/lib/stack.c b/arch/powerpc/lib/stack.c
index 5840fe63490..f2a4652e081 100644
--- a/arch/powerpc/lib/stack.c
+++ b/arch/powerpc/lib/stack.c
@@ -12,6 +12,7 @@
*/
#include <common.h>
#include <init.h>
+#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/powerpc/lib/traps.c b/arch/powerpc/lib/traps.c
index 288e3776328..c7bce82a44b 100644
--- a/arch/powerpc/lib/traps.c
+++ b/arch/powerpc/lib/traps.c
@@ -4,8 +4,8 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
-#include <common.h>
#include <init.h>
+#include <asm/global_data.h>
DECLARE_GLOBAL_DATA_PTR;