Merge branch 'master_common_h_cleanup' of https://source.denx.de/u-boot/custodians/u-boot-sh

- Remove common.h usage
2023-11-02 18:32:57 -04:00 · 2023-11-02 18:32:57 -04:00 · 97962260cb
commit 97962260cb
parent 07fe79c93c 7d824618d7
19 changed files with 11 additions and 19 deletions
--- a/arch/arm/include/asm/armv8/mmu.h
+++ b/arch/arm/include/asm/armv8/mmu.h
@ -118,6 +118,8 @@
 #define HCR_EL2_E2H_BIT		34

 #ifndef __ASSEMBLY__
+#include <linux/types.h>
+
 static inline void set_ttbr_tcr_mair(int el, u64 table, u64 tcr, u64 attr)
 {
 	asm volatile("dsb sy");
--- a/arch/arm/mach-rmobile/board.c
+++ b/arch/arm/mach-rmobile/board.c
@ -3,7 +3,7 @@
 * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 * (C) Copyright 2012 Renesas Solutions Corp.
 */
-#include <common.h>
+
 #include <init.h>
 #include <asm/io.h>

--- a/arch/arm/mach-rmobile/cpu_info-r8a7740.c
+++ b/arch/arm/mach-rmobile/cpu_info-r8a7740.c
@ -3,7 +3,7 @@
 * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 * (C) Copyright 2012 Renesas Solutions Corp.
 */
-#include <common.h>
+
 #include <asm/io.h>

 u32 rmobile_get_cpu_type(void)
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@ -4,7 +4,7 @@
 *
 * Copyright (C) 2013,2014 Renesas Electronics Corporation
 */
-#include <common.h>
+
 #include <asm/io.h>

 #define PRR_MASK		0x7fff
--- a/arch/arm/mach-rmobile/cpu_info-rzg.c
+++ b/arch/arm/mach-rmobile/cpu_info-rzg.c
@ -3,7 +3,7 @@
 * Copyright (C) 2021 Renesas Electronics Corporation
 *
 */
-#include <common.h>
+
 #include <linux/libfdt.h>

 /* If the firmware passed a device tree, use it for soc identification. */
--- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c
+++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
@ -4,7 +4,6 @@
 *
 */

-#include <common.h>
 #include <asm/io.h>
 #include <linux/libfdt.h>

--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@ -3,7 +3,7 @@
 * (C) Copyright 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 * (C) Copyright 2012-2021 Renesas Solutions Corp.
 */
-#include <common.h>
+
 #include <cpu_func.h>
 #include <asm/cache.h>
 #include <init.h>
--- a/arch/arm/mach-rmobile/emac.c
+++ b/arch/arm/mach-rmobile/emac.c
@ -6,7 +6,6 @@
 * Copyright (C) 2012  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
 */

-#include <common.h>
 #include <net.h>
 #include <linux/errno.h>
 #include <netdev.h>
--- a/arch/arm/mach-rmobile/memmap-gen3.c
+++ b/arch/arm/mach-rmobile/memmap-gen3.c
@ -5,10 +5,10 @@
 * Copyright (C) 2017 Marek Vasut <marek.vasut@gmail.com>
 */

-#include <common.h>
-#include <cpu_func.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
+#include <cpu_func.h>

 #define GEN3_NR_REGIONS 16

--- a/arch/arm/mach-rmobile/memmap-rzg2l.c
+++ b/arch/arm/mach-rmobile/memmap-rzg2l.c
@ -6,9 +6,9 @@
 * Copyright (C) 2023 Renesas Electronics Corp.
 */

-#include <common.h>
 #include <asm/armv8/mmu.h>
 #include <asm/global_data.h>
+#include <asm/u-boot.h>
 #include <cpu_func.h>

 #define RZG2L_NR_REGIONS 16
--- a/arch/arm/mach-rmobile/pfc-r8a7740.c
+++ b/arch/arm/mach-rmobile/pfc-r8a7740.c
@ -18,7 +18,7 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#include <common.h>
+
 #include <sh_pfc.h>
 #include <asm/gpio.h>
 #include <asm/arch/irqs.h>
--- a/arch/arm/mach-rmobile/psci-r8a779a0.c
+++ b/arch/arm/mach-rmobile/psci-r8a779a0.c
@ -6,7 +6,6 @@
 *
 */

-#include <common.h>
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
--- a/board/renesas/rzg2l/rzg2l.c
+++ b/board/renesas/rzg2l/rzg2l.c
@ -4,7 +4,6 @@
 * Copyright (C) 2023 Renesas Electronics Corporation
 */

-#include <common.h>
 #include <fdtdec.h>
 #include <linux/libfdt.h>

--- a/drivers/clk/renesas/r9a07g044-cpg.c
+++ b/drivers/clk/renesas/r9a07g044-cpg.c
@ -5,7 +5,6 @@
 * Copyright (C) 2021-2023 Renesas Electronics Corp.
 */

-#include <common.h>
 #include <dm/device.h>
 #include <dt-bindings/clock/r9a07g044-cpg.h>
 #include <linux/clk-provider.h>
--- a/drivers/clk/renesas/rzg2l-cpg.c
+++ b/drivers/clk/renesas/rzg2l-cpg.c
@ -11,7 +11,6 @@
 * Copyright (C) 2015 Renesas Electronics Corp.
 */

-#include <common.h>
 #include <asm/io.h>
 #include <clk-uclass.h>
 #include <dm.h>
--- a/drivers/gpio/rzg2l-gpio.c
+++ b/drivers/gpio/rzg2l-gpio.c
@ -5,7 +5,6 @@
 * Copyright (C) 2021-2023 Renesas Electronics Corp.
 */

-#include <common.h>
 #include <asm-generic/gpio.h>
 #include <asm/io.h>
 #include <dm/device.h>
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@ -3,7 +3,6 @@
 * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
 */

-#include <common.h>
 #include <bouncebuf.h>
 #include <clk.h>
 #include <fdtdec.h>
--- a/drivers/pinctrl/renesas/rzg2l-pfc.c
+++ b/drivers/pinctrl/renesas/rzg2l-pfc.c
@ -5,7 +5,6 @@
 * Copyright (C) 2021-2023 Renesas Electronics Corp.
 */

-#include <common.h>
 #include <asm/io.h>
 #include <clk.h>
 #include <dm.h>
--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@ -6,7 +6,6 @@
 * Copyright (C) 2002 - 2008  Paul Mundt
 */

-#include <common.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/processor.h>