[PATCH v3 12/12] arm: mach-k3: Remove empty sys_proto.h include

Christian Gmeiner christian.gmeiner at gmail.com
Thu Apr 6 18:02:21 CEST 2023


>
> This header file is now empty, remove it.
>
> Signed-off-by: Andrew Davis <afd at ti.com>

Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>

> ---
>  arch/arm/mach-k3/am642_init.c             |  2 --
>  arch/arm/mach-k3/am654_init.c             |  1 -
>  arch/arm/mach-k3/common.c                 |  1 -
>  arch/arm/mach-k3/include/mach/sys_proto.h | 10 ----------
>  arch/arm/mach-k3/j721e_init.c             |  1 -
>  arch/arm/mach-k3/j721s2_init.c            |  1 -
>  arch/arm/mach-k3/security.c               |  1 -
>  arch/arm/mach-k3/sysfw-loader.c           |  1 -
>  board/siemens/iot2050/board.c             |  1 -
>  board/ti/am62ax/evm.c                     |  1 -
>  board/ti/am62x/evm.c                      |  1 -
>  board/ti/am64x/evm.c                      |  1 -
>  board/ti/am65x/evm.c                      |  2 --
>  board/ti/j721e/evm.c                      |  2 --
>  board/ti/j721s2/evm.c                     |  2 --
>  drivers/phy/phy-ti-am654.c                |  1 -
>  drivers/ram/k3-am654-ddrss.c              |  1 -
>  17 files changed, 30 deletions(-)
>  delete mode 100644 arch/arm/mach-k3/include/mach/sys_proto.h
>
> diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c
> index ef84aad819c..5d53358cf26 100644
> --- a/arch/arm/mach-k3/am642_init.c
> +++ b/arch/arm/mach-k3/am642_init.c
> @@ -13,9 +13,7 @@
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
>  #include "sysfw-loader.h"
> -#include <asm/arch/sys_proto.h>
>  #include "common.h"
> -#include <asm/arch/sys_proto.h>
>  #include <linux/soc/ti/ti_sci_protocol.h>
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
> diff --git a/arch/arm/mach-k3/am654_init.c b/arch/arm/mach-k3/am654_init.c
> index 2336da4b454..0d3889cde2b 100644
> --- a/arch/arm/mach-k3/am654_init.c
> +++ b/arch/arm/mach-k3/am654_init.c
> @@ -14,7 +14,6 @@
>  #include <spl.h>
>  #include <asm/arch/hardware.h>
>  #include "sysfw-loader.h"
> -#include <asm/arch/sys_proto.h>
>  #include "common.h"
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
> diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
> index 9f2f5a98771..e29e51b7042 100644
> --- a/arch/arm/mach-k3/common.c
> +++ b/arch/arm/mach-k3/common.c
> @@ -19,7 +19,6 @@
>  #include <asm/cache.h>
>  #include <linux/soc/ti/ti_sci_protocol.h>
>  #include <fdt_support.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/hardware.h>
>  #include <asm/io.h>
>  #include <fs_loader.h>
> diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h
> deleted file mode 100644
> index 5638c6f8c8a..00000000000
> --- a/arch/arm/mach-k3/include/mach/sys_proto.h
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0+ */
> -/*
> - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
> - *     Andreas Dannenberg <dannenberg at ti.com>
> - */
> -
> -#ifndef _SYS_PROTO_H_
> -#define _SYS_PROTO_H_
> -
> -#endif
> diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
> index 31d324e2179..9bba5f79545 100644
> --- a/arch/arm/mach-k3/j721e_init.c
> +++ b/arch/arm/mach-k3/j721e_init.c
> @@ -14,7 +14,6 @@
>  #include <asm/arch/hardware.h>
>  #include "sysfw-loader.h"
>  #include "common.h"
> -#include <asm/arch/sys_proto.h>
>  #include <linux/soc/ti/ti_sci_protocol.h>
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
> diff --git a/arch/arm/mach-k3/j721s2_init.c b/arch/arm/mach-k3/j721s2_init.c
> index 175ac4028a0..001d9466c20 100644
> --- a/arch/arm/mach-k3/j721s2_init.c
> +++ b/arch/arm/mach-k3/j721s2_init.c
> @@ -14,7 +14,6 @@
>  #include <asm/arch/hardware.h>
>  #include "sysfw-loader.h"
>  #include "common.h"
> -#include <asm/arch/sys_proto.h>
>  #include <linux/soc/ti/ti_sci_protocol.h>
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
> diff --git a/arch/arm/mach-k3/security.c b/arch/arm/mach-k3/security.c
> index 092588f4b5e..6179f7373aa 100644
> --- a/arch/arm/mach-k3/security.c
> +++ b/arch/arm/mach-k3/security.c
> @@ -17,7 +17,6 @@
>  #include <linux/soc/ti/ti_sci_protocol.h>
>  #include <mach/spl.h>
>  #include <spl.h>
> -#include <asm/arch/sys_proto.h>
>  #include <linux/dma-mapping.h>
>
>  #include "common.h"
> diff --git a/arch/arm/mach-k3/sysfw-loader.c b/arch/arm/mach-k3/sysfw-loader.c
> index c4c5c371100..9be2d9eaea2 100644
> --- a/arch/arm/mach-k3/sysfw-loader.c
> +++ b/arch/arm/mach-k3/sysfw-loader.c
> @@ -23,7 +23,6 @@
>  #include <spi_flash.h>
>
>  #include <asm/io.h>
> -#include <asm/arch/sys_proto.h>
>  #include "common.h"
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/siemens/iot2050/board.c b/board/siemens/iot2050/board.c
> index 1ba3e90c6fc..2653e107450 100644
> --- a/board/siemens/iot2050/board.c
> +++ b/board/siemens/iot2050/board.c
> @@ -21,7 +21,6 @@
>  #include <spl.h>
>  #include <version.h>
>  #include <linux/delay.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
> diff --git a/board/ti/am62ax/evm.c b/board/ti/am62ax/evm.c
> index beef3f2f3da..f2dd3b4192e 100644
> --- a/board/ti/am62ax/evm.c
> +++ b/board/ti/am62ax/evm.c
> @@ -7,7 +7,6 @@
>   */
>
>  #include <asm/arch/hardware.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/io.h>
>  #include <common.h>
>  #include <dm/uclass.h>
> diff --git a/board/ti/am62x/evm.c b/board/ti/am62x/evm.c
> index 20b2a701223..034fbed3aa4 100644
> --- a/board/ti/am62x/evm.c
> +++ b/board/ti/am62x/evm.c
> @@ -15,7 +15,6 @@
>  #include <fdt_support.h>
>  #include <asm/io.h>
>  #include <asm/arch/hardware.h>
> -#include <asm/arch/sys_proto.h>
>  #include <dm/uclass.h>
>
>  DECLARE_GLOBAL_DATA_PTR;
> diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c
> index c88139ac7ac..b63792e8888 100644
> --- a/board/ti/am64x/evm.c
> +++ b/board/ti/am64x/evm.c
> @@ -14,7 +14,6 @@
>  #include <spl.h>
>  #include <fdt_support.h>
>  #include <asm/arch/hardware.h>
> -#include <asm/arch/sys_proto.h>
>  #include <env.h>
>
>  #include "../common/board_detect.h"
> diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
> index 4053b8333cf..706b2198183 100644
> --- a/board/ti/am65x/evm.c
> +++ b/board/ti/am65x/evm.c
> @@ -13,7 +13,6 @@
>  #include <image.h>
>  #include <init.h>
>  #include <net.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/global_data.h>
>  #include <asm/gpio.h>
> @@ -21,7 +20,6 @@
>  #include <asm/omap_common.h>
>  #include <env.h>
>  #include <spl.h>
> -#include <asm/arch/sys_proto.h>
>
>  #include "../common/board_detect.h"
>
> diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
> index 00ce009d3e8..2398bead782 100644
> --- a/board/ti/j721e/evm.c
> +++ b/board/ti/j721e/evm.c
> @@ -15,13 +15,11 @@
>  #include <init.h>
>  #include <log.h>
>  #include <net.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/global_data.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <spl.h>
> -#include <asm/arch/sys_proto.h>
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
>
> diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c
> index d3f9a655899..09d26883f19 100644
> --- a/board/ti/j721s2/evm.c
> +++ b/board/ti/j721s2/evm.c
> @@ -15,12 +15,10 @@
>  #include <init.h>
>  #include <log.h>
>  #include <net.h>
> -#include <asm/arch/sys_proto.h>
>  #include <asm/arch/hardware.h>
>  #include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <spl.h>
> -#include <asm/arch/sys_proto.h>
>  #include <dm.h>
>  #include <dm/uclass-internal.h>
>  #include <dm/root.h>
> diff --git a/drivers/phy/phy-ti-am654.c b/drivers/phy/phy-ti-am654.c
> index 27a312227bc..70a746d2c92 100644
> --- a/drivers/phy/phy-ti-am654.c
> +++ b/drivers/phy/phy-ti-am654.c
> @@ -16,7 +16,6 @@
>  #include <dt-bindings/phy/phy.h>
>  #include <generic-phy.h>
>  #include <asm/io.h>
> -#include <asm/arch/sys_proto.h>
>  #include <power-domain.h>
>  #include <regmap.h>
>  #include <syscon.h>
> diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c
> index adac14f9464..b8338f84a3d 100644
> --- a/drivers/ram/k3-am654-ddrss.c
> +++ b/drivers/ram/k3-am654-ddrss.c
> @@ -13,7 +13,6 @@
>  #include <ram.h>
>  #include <asm/io.h>
>  #include <power-domain.h>
> -#include <asm/arch/sys_proto.h>
>  #include <dm/device_compat.h>
>  #include <power/regulator.h>
>  #include "k3-am654-ddrss.h"
> --
> 2.39.2
>


-- 
greets
--
Christian Gmeiner, MSc

https://christian-gmeiner.info/privacypolicy


More information about the U-Boot mailing list