diff options
author | Tom Rini <trini@konsulko.com> | 2023-10-24 19:12:21 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-24 19:12:21 -0400 |
commit | fb428b61819444b9337075f49c72f326f5d12085 (patch) | |
tree | 59ad3b6c3df52508641f485591d5af5029b02d9a /arch/mips/lib | |
parent | 5cab3515f8c9796015739c1750b8933291c816be (diff) | |
parent | 35dc728a3cd14338b5fa0b6f231aa555077c98a1 (diff) |
Merge branch '2023-10-24-assorted-general-fixes-and-updates'
- Remove common.h in a number of places and make checkpatch.pl complain
about its use in all cases, allow the mbr command to handle 4 primary
partitions, fix an issue with the pstore command, fix a problem with
cli parsing of escape sequences, remove and ignore more files, allow
for the serial port to be flushed with every print (for debugging),
and add SCMI power domain support.
Diffstat (limited to 'arch/mips/lib')
-rw-r--r-- | arch/mips/lib/boot.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/bootm.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/cache.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/reloc.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/spl.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/stack.c | 1 | ||||
-rw-r--r-- | arch/mips/lib/traps.c | 3 |
7 files changed, 2 insertions, 7 deletions
diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c index 1b29d637ce9..749625aa974 100644 --- a/arch/mips/lib/boot.c +++ b/arch/mips/lib/boot.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <command.h> #include <cpu_func.h> #include <asm/global_data.h> diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index ab92bd06b0e..d6d2f7d9d03 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ -#include <common.h> #include <bootstage.h> #include <env.h> #include <image.h> diff --git a/arch/mips/lib/cache.c b/arch/mips/lib/cache.c index d23b38d6b93..d365578b926 100644 --- a/arch/mips/lib/cache.c +++ b/arch/mips/lib/cache.c @@ -4,7 +4,6 @@ * Wolfgang Denk, DENX Software Engineering, <wd@denx.de> */ -#include <common.h> #include <cpu_func.h> #include <malloc.h> #include <asm/cache.h> diff --git a/arch/mips/lib/reloc.c b/arch/mips/lib/reloc.c index 9cf6809f406..69dd63a31d2 100644 --- a/arch/mips/lib/reloc.c +++ b/arch/mips/lib/reloc.c @@ -26,7 +26,6 @@ * terminating R_MIPS_NONE reloc includes no offset. */ -#include <common.h> #include <cpu_func.h> #include <init.h> #include <asm/relocs.h> diff --git a/arch/mips/lib/spl.c b/arch/mips/lib/spl.c index f96fda5b2de..b4087546dd1 100644 --- a/arch/mips/lib/spl.c +++ b/arch/mips/lib/spl.c @@ -3,7 +3,6 @@ * Copyright (C) 2020 Stefan Roese <sr@denx.de> */ -#include <common.h> #include <cpu_func.h> #include <log.h> #include <spl.h> diff --git a/arch/mips/lib/stack.c b/arch/mips/lib/stack.c index 930d21856d9..5797271ae94 100644 --- a/arch/mips/lib/stack.c +++ b/arch/mips/lib/stack.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ -#include <common.h> #include <init.h> #include <log.h> #include <asm/global_data.h> diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 7a682f256a6..40469d1be09 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -10,9 +10,9 @@ * Copyright (C) 2014, Imagination Technologies Ltd. */ -#include <common.h> #include <asm/global_data.h> #include <asm/ptrace.h> +#include <config.h> #include <cpu_func.h> #include <hang.h> #include <init.h> @@ -20,6 +20,7 @@ #include <asm/mipsregs.h> #include <asm/addrspace.h> #include <asm/system.h> +#include <asm/u-boot.h> DECLARE_GLOBAL_DATA_PTR; |