diff options
| author | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-05-20 13:35:03 -0600 |
| commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
| tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /arch/xtensa | |
| parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <[email protected]>
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/cpu/cpu.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/cpu/exceptions.c | 2 | ||||
| -rw-r--r-- | arch/xtensa/include/asm/global_data.h | 2 | ||||
| -rw-r--r-- | arch/xtensa/lib/bootm.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/lib/cache.c | 1 | ||||
| -rw-r--r-- | arch/xtensa/lib/time.c | 1 |
6 files changed, 4 insertions, 5 deletions
diff --git a/arch/xtensa/cpu/cpu.c b/arch/xtensa/cpu/cpu.c index 98d9753b7e3..abcd8f7984f 100644 --- a/arch/xtensa/cpu/cpu.c +++ b/arch/xtensa/cpu/cpu.c @@ -8,7 +8,7 @@ * CPU specific code */ -#include <common.h> +#include <config.h> #include <command.h> #include <init.h> #include <vsprintf.h> diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c index cf9af4326a2..206767094e9 100644 --- a/arch/xtensa/cpu/exceptions.c +++ b/arch/xtensa/cpu/exceptions.c @@ -10,12 +10,12 @@ * (Note that alloca is a special case and handled in start.S) */ -#include <common.h> #include <command.h> #include <irq_func.h> #include <asm/ptrace.h> #include <asm/string.h> #include <asm/regs.h> +#include <vsprintf.h> typedef void (*handler_t)(struct pt_regs *); diff --git a/arch/xtensa/include/asm/global_data.h b/arch/xtensa/include/asm/global_data.h index 1157978ab68..40c129db4ac 100644 --- a/arch/xtensa/include/asm/global_data.h +++ b/arch/xtensa/include/asm/global_data.h @@ -6,6 +6,8 @@ #ifndef _XTENSA_GBL_DATA_H #define _XTENSA_GBL_DATA_H +#include <asm/u-boot.h> + /* Architecture-specific global data */ struct arch_global_data { diff --git a/arch/xtensa/lib/bootm.c b/arch/xtensa/lib/bootm.c index 9780d46e9b8..1de06b7fb53 100644 --- a/arch/xtensa/lib/bootm.c +++ b/arch/xtensa/lib/bootm.c @@ -4,7 +4,6 @@ * (C) Copyright 2014 Cadence Design Systems Inc. */ -#include <common.h> #include <bootm.h> #include <bootstage.h> #include <command.h> diff --git a/arch/xtensa/lib/cache.c b/arch/xtensa/lib/cache.c index 4e0c0acc3bb..e6a7f6827fc 100644 --- a/arch/xtensa/lib/cache.c +++ b/arch/xtensa/lib/cache.c @@ -4,7 +4,6 @@ * (C) Copyright 2014 - 2016 Cadence Design Systems Inc. */ -#include <common.h> #include <cpu_func.h> #include <asm/cache.h> diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c index 1c927d2a6a3..c6739584bbf 100644 --- a/arch/xtensa/lib/time.c +++ b/arch/xtensa/lib/time.c @@ -3,7 +3,6 @@ * (C) Copyright 2008 - 2013 Tensilica Inc. */ -#include <common.h> #include <clock_legacy.h> #include <time.h> #include <asm/global_data.h> |