riscv: Remove common.h usage

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> Reviewed-by: Rick Chen <rick@andestech.com>
2024-11-28 15:41:40 +00:00 · 2023-10-12 19:03:59 -04:00 · 2023-10-12 19:03:59 -04:00 · 0b9441ae76
commit 0b9441ae76
parent 8991fed97d
34 changed files with 9 additions and 32 deletions
--- a/arch/riscv/cpu/andesv5/cache.c
+++ b/arch/riscv/cpu/andesv5/cache.c
@ -6,7 +6,6 @@

 #include <asm/csr.h>
 #include <asm/asm.h>
-#include <common.h>
 #include <cache.h>
 #include <cpu_func.h>
 #include <dm.h>
--- a/arch/riscv/cpu/andesv5/cpu.c
+++ b/arch/riscv/cpu/andesv5/cpu.c
@ -5,7 +5,6 @@
 */

 /* CPU specific code */
-#include <common.h>
 #include <cpu_func.h>
 #include <irq_func.h>
 #include <asm/cache.h>
--- a/arch/riscv/cpu/andesv5/spl.c
+++ b/arch/riscv/cpu/andesv5/spl.c
@ -3,7 +3,6 @@
 * Copyright (C) 2023 Andes Technology Corporation
 * Rick Chen, Andes Technology Corporation <rick@andestech.com>
 */
-#include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
--- a/arch/riscv/cpu/cpu.c
+++ b/arch/riscv/cpu/cpu.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <cpu.h>
 #include <dm.h>
 #include <dm/lists.h>
--- a/arch/riscv/cpu/fu540/dram.c
+++ b/arch/riscv/cpu/fu540/dram.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
--- a/arch/riscv/cpu/fu740/dram.c
+++ b/arch/riscv/cpu/fu740/dram.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <linux/sizes.h>
--- a/arch/riscv/cpu/generic/cpu.c
+++ b/arch/riscv/cpu/generic/cpu.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <irq_func.h>
 #include <asm/cache.h>

--- a/arch/riscv/cpu/generic/dram.c
+++ b/arch/riscv/cpu/generic/dram.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <asm/global_data.h>
--- a/arch/riscv/cpu/jh7110/dram.c
+++ b/arch/riscv/cpu/jh7110/dram.c
@ -4,7 +4,6 @@
 * Author: Yanhong Wang <yanhong.wang@starfivetech.com>
 */

-#include <common.h>
 #include <fdtdec.h>
 #include <init.h>
 #include <linux/sizes.h>
--- a/arch/riscv/cpu/jh7110/spl.c
+++ b/arch/riscv/cpu/jh7110/spl.c
@ -3,7 +3,6 @@
 * Copyright (C) 2022 StarFive Technology Co., Ltd.
 * Author: Yanhong Wang<yanhong.wang@starfivetech.com>
 */
-#include <common.h>
 #include <asm/arch/eeprom.h>
 #include <asm/csr.h>
 #include <asm/sections.h>
--- a/arch/riscv/cpu/mtrap.S
+++ b/arch/riscv/cpu/mtrap.S
@ -11,7 +11,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <asm/encoding.h>

 #ifdef CONFIG_32BIT
--- a/arch/riscv/cpu/start.S
+++ b/arch/riscv/cpu/start.S
@ -11,7 +11,6 @@

 #include <asm-offsets.h>
 #include <config.h>
-#include <common.h>
 #include <elf.h>
 #include <system-constants.h>
 #include <asm/encoding.h>
--- a/arch/riscv/include/asm/arch-andes/csr.h
+++ b/arch/riscv/include/asm/arch-andes/csr.h
@ -7,6 +7,7 @@
 #define _ASM_ANDES_CSR_H

 #include <asm/asm.h>
+#include <linux/bitops.h>
 #include <linux/const.h>

 #define CSR_MCACHE_CTL 0x7ca
--- a/arch/riscv/include/asm/arch-jh7110/eeprom.h
+++ b/arch/riscv/include/asm/arch-jh7110/eeprom.h
@ -7,6 +7,8 @@
 #ifndef _ASM_RISCV_EEPROM_H
 #define _ASM_RISCV_EEPROM_H

+#include <linux/types.h>
+
 u8 get_pcb_revision_from_eeprom(void);
 u32 get_ddr_size_from_eeprom(void);

--- a/arch/riscv/include/asm/dma-mapping.h
+++ b/arch/riscv/include/asm/dma-mapping.h
@ -9,7 +9,6 @@
 #ifndef __ASM_RISCV_DMA_MAPPING_H
 #define __ASM_RISCV_DMA_MAPPING_H

-#include <common.h>
 #include <linux/types.h>
 #include <asm/cache.h>
 #include <cpu_func.h>
--- a/arch/riscv/include/asm/smp.h
+++ b/arch/riscv/include/asm/smp.h
@ -7,6 +7,8 @@
 #ifndef _ASM_RISCV_SMP_H
 #define _ASM_RISCV_SMP_H

+#include <linux/types.h>
+
 /**
 * struct ipi_data - Inter-processor interrupt (IPI) data structure
 *
--- a/arch/riscv/lib/aclint_ipi.c
+++ b/arch/riscv/lib/aclint_ipi.c
@ -8,7 +8,6 @@
 * associated with software and timer interrupts.
 */

-#include <common.h>
 #include <dm.h>
 #include <regmap.h>
 #include <syscon.h>
--- a/arch/riscv/lib/andes_plicsw.c
+++ b/arch/riscv/lib/andes_plicsw.c
@ -8,7 +8,6 @@
 * similar to RISC-V PLIC.
 */

-#include <common.h>
 #include <dm.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
--- a/arch/riscv/lib/asm-offsets.c
+++ b/arch/riscv/lib/asm-offsets.c
@ -8,7 +8,6 @@
 * assembly language modules.
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <linux/kbuild.h>

--- a/arch/riscv/lib/boot.c
+++ b/arch/riscv/lib/boot.c
@ -4,8 +4,7 @@
 * Rick Chen, Andes Technology Corporation <rick@andestech.com>
 */

-#include <common.h>
-#include <command.h>
+#include <asm/u-boot.h>

 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char *const argv[])
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@ -6,7 +6,6 @@
 * Rick Chen, Andes Technology Corporation <rick@andestech.com>
 */

-#include <common.h>
 #include <bootstage.h>
 #include <command.h>
 #include <dm.h>
--- a/arch/riscv/lib/cache.c
+++ b/arch/riscv/lib/cache.c
@ -4,7 +4,6 @@
 * Rick Chen, Andes Technology Corporation <rick@andestech.com>
 */

-#include <common.h>
 #include <cpu_func.h>

 void invalidate_icache_all(void)
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@ -6,7 +6,6 @@

 #define LOG_CATEGORY LOGC_ARCH

-#include <common.h>
 #include <fdt_support.h>
 #include <log.h>
 #include <mapmem.h>
--- a/arch/riscv/lib/image.c
+++ b/arch/riscv/lib/image.c
@ -6,7 +6,6 @@
 * Based on arm/lib/image.c
 */

-#include <common.h>
 #include <image.h>
 #include <mapmem.h>
 #include <errno.h>
--- a/arch/riscv/lib/interrupts.c
+++ b/arch/riscv/lib/interrupts.c
@ -10,7 +10,6 @@
 */

 #include <linux/compat.h>
-#include <common.h>
 #include <efi_loader.h>
 #include <hang.h>
 #include <irq_func.h>
--- a/arch/riscv/lib/reset.c
+++ b/arch/riscv/lib/reset.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
 */

-#include <common.h>
 #include <command.h>
 #include <hang.h>

--- a/arch/riscv/lib/sbi.c
+++ b/arch/riscv/lib/sbi.c
@ -7,7 +7,7 @@
 * Taken from Linux arch/riscv/kernel/sbi.c
 */

-#include <common.h>
+#include <errno.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>

--- a/arch/riscv/lib/sbi_ipi.c
+++ b/arch/riscv/lib/sbi_ipi.c
@ -4,7 +4,6 @@
 * Lukas Auer <lukas.auer@aisec.fraunhofer.de>
 */

-#include <common.h>
 #include <asm/encoding.h>
 #include <asm/sbi.h>

--- a/arch/riscv/lib/sifive_cache.c
+++ b/arch/riscv/lib/sifive_cache.c
@ -3,9 +3,9 @@
 * Copyright (C) 2021 SiFive, Inc
 */

-#include <common.h>
 #include <cache.h>
 #include <cpu_func.h>
+#include <log.h>
 #include <dm.h>

 void enable_caches(void)
--- a/arch/riscv/lib/smp.c
+++ b/arch/riscv/lib/smp.c
@ -4,7 +4,6 @@
 * Lukas Auer <lukas.auer@aisec.fraunhofer.de>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/barrier.h>
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@ -3,7 +3,6 @@
 * Copyright (C) 2019 Fraunhofer AISEC,
 * Lukas Auer <lukas.auer@aisec.fraunhofer.de>
 */
-#include <common.h>
 #include <cpu_func.h>
 #include <hang.h>
 #include <init.h>
--- a/board/AndesTech/ae350/ae350.c
+++ b/board/AndesTech/ae350/ae350.c
@ -4,7 +4,7 @@
 * Rick Chen, Andes Technology Corporation <rick@andestech.com>
 */

-#include <common.h>
+#include <config.h>
 #include <cpu_func.h>
 #include <flash.h>
 #include <image.h>
--- a/board/sifive/unmatched/hifive-platform-i2c-eeprom.c
+++ b/board/sifive/unmatched/hifive-platform-i2c-eeprom.c
@ -9,7 +9,6 @@
 * Timur Tabi (timur@freescale.com)
 */

-#include <common.h>
 #include <command.h>
 #include <env.h>
 #include <i2c.h>
--- a/board/sifive/unmatched/unmatched.c
+++ b/board/sifive/unmatched/unmatched.c
@ -6,7 +6,6 @@
 *   Pragnesh Patel <pragnesh.patel@sifive.com>
 */

-#include <common.h>
 #include <cpu_func.h>
 #include <dm.h>
 #include <asm/sections.h>