diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-15 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-15 10:16:45 -0500 |
| commit | 2ae80437fbe0181184ae4b188b89629b902702c6 (patch) | |
| tree | 846f70a5df9c80ef76284c39f0da58b8c3eba96f /arch/m68k/lib | |
| parent | 76b7936e6f781c86b0d3159f67f1506d01c196ce (diff) | |
| parent | 401d1c4f5d2d29c4bc4beaec95402ca23eb63295 (diff) | |
| download | u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.gz u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.tar.xz u-boot-2ae80437fbe0181184ae4b188b89629b902702c6.zip | |
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/m68k/lib')
| -rw-r--r-- | arch/m68k/lib/bdinfo.c | 1 | ||||
| -rw-r--r-- | arch/m68k/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/m68k/lib/fec.c | 1 | ||||
| -rw-r--r-- | arch/m68k/lib/time.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index 92ea175202..7eca6725a6 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/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/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index 320451144f..51a6f93858 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -11,6 +11,7 @@ #include <image.h> #include <lmb.h> #include <log.h> +#include <asm/global_data.h> #include <u-boot/zlib.h> #include <bzlib.h> #include <watchdog.h> diff --git a/arch/m68k/lib/fec.c b/arch/m68k/lib/fec.c index dde353ad17..eecea7a023 100644 --- a/arch/m68k/lib/fec.c +++ b/arch/m68k/lib/fec.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <asm/global_data.h> #include <linux/libfdt.h> #include <fdt_support.h> diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index a3eb6db54b..cbe29e72a8 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -10,6 +10,7 @@ #include <init.h> #include <irq_func.h> #include <time.h> +#include <asm/global_data.h> #include <linux/delay.h> #include <asm/timer.h> |