[PATCH 111/149] board: rockchip: Remove <common.h> and add needed includes

Kever Yang kever.yang at rock-chips.com
Tue May 7 09:41:03 CEST 2024


On 2024/5/1 10:42, Tom Rini wrote:
> Remove <common.h> from this board vendor directory and when needed
> add missing include files directly.
>
> Signed-off-by: Tom Rini <trini at konsulko.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> Cc: huang lin <hl at rock-chips.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Philipp Tomsich <philipp.tomsich at vrull.eu>
> Cc: Kever Yang <kever.yang at rock-chips.com>
> Cc: Andy Yan <andy.yan at rock-chips.com>
> Cc: Michael Trimarchi <michael at amarulasolutions.com>
> ---
>   arch/arm/include/asm/arch-rockchip/grf_rk3308.h | 2 ++
>   board/rockchip/evb_rk3036/evb_rk3036.c          | 1 -
>   board/rockchip/evb_rk3308/evb_rk3308.c          | 1 -
>   board/rockchip/evb_rv1108/evb_rv1108.c          | 1 -
>   board/rockchip/kylin_rk3036/kylin_rk3036.c      | 1 -
>   board/rockchip/tinker_rk3288/tinker-rk3288.c    | 1 -
>   6 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3308.h b/arch/arm/include/asm/arch-rockchip/grf_rk3308.h
> index a995bb950d97..f4bbc2401310 100644
> --- a/arch/arm/include/asm/arch-rockchip/grf_rk3308.h
> +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3308.h
> @@ -5,6 +5,8 @@
>   #ifndef _ASM_ARCH_GRF_rk3308_H
>   #define _ASM_ARCH_GRF_rk3308_H
>   
> +#include <linux/kernel.h>
> +
>   struct rk3308_grf {
>   	unsigned int gpio0a_iomux;
>   	unsigned int reserved0;
> diff --git a/board/rockchip/evb_rk3036/evb_rk3036.c b/board/rockchip/evb_rk3036/evb_rk3036.c
> index 8c606463e455..a0805030ea46 100644
> --- a/board/rockchip/evb_rk3036/evb_rk3036.c
> +++ b/board/rockchip/evb_rk3036/evb_rk3036.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2015 Rockchip Electronics Co., Ltd
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <asm/io.h>
>   #include <asm/arch-rockchip/uart.h>
> diff --git a/board/rockchip/evb_rk3308/evb_rk3308.c b/board/rockchip/evb_rk3308/evb_rk3308.c
> index e0c96fd70a28..c895da934a99 100644
> --- a/board/rockchip/evb_rk3308/evb_rk3308.c
> +++ b/board/rockchip/evb_rk3308/evb_rk3308.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2018 Rockchip Electronics Co., Ltd
>    */
>   
> -#include <common.h>
>   #include <adc.h>
>   #include <asm/global_data.h>
>   
> diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c
> index 0d7a486bed74..48b9d8f80c4b 100644
> --- a/board/rockchip/evb_rv1108/evb_rv1108.c
> +++ b/board/rockchip/evb_rv1108/evb_rv1108.c
> @@ -4,7 +4,6 @@
>    * Authors: Andy Yan <andy.yan at rock-chips.com>
>    */
>   
> -#include <common.h>
>   #include <init.h>
>   #include <syscon.h>
>   #include <asm/global_data.h>
> diff --git a/board/rockchip/kylin_rk3036/kylin_rk3036.c b/board/rockchip/kylin_rk3036/kylin_rk3036.c
> index 0ca91cdeb014..c452b131208d 100644
> --- a/board/rockchip/kylin_rk3036/kylin_rk3036.c
> +++ b/board/rockchip/kylin_rk3036/kylin_rk3036.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2015 Rockchip Electronics Co., Ltd
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <env.h>
>   #include <init.h>
> diff --git a/board/rockchip/tinker_rk3288/tinker-rk3288.c b/board/rockchip/tinker_rk3288/tinker-rk3288.c
> index e6e75981c2d1..e966e9f201ab 100644
> --- a/board/rockchip/tinker_rk3288/tinker-rk3288.c
> +++ b/board/rockchip/tinker_rk3288/tinker-rk3288.c
> @@ -3,7 +3,6 @@
>    * (C) Copyright 2016 Rockchip Electronics Co., Ltd
>    */
>   
> -#include <common.h>
>   #include <dm.h>
>   #include <env.h>
>   #include <i2c_eeprom.h>


More information about the U-Boot mailing list