[U-Boot] [PATCH 2/3] rockchip: ram: rk3399: update for TPL

[Andy Yan]

Kever Yang <kever.yang at rock-chips.com> 于2019年4月1日周一 下午5:25写道：

> Init the ddr sdram in TPL instead of SPL, update the code.
>
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
> ---
>
>  drivers/ram/rockchip/sdram_rk3399.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
>
>
Tested-by: Andy Yan <andy.yan at rock-chips.com>


> diff --git a/drivers/ram/rockchip/sdram_rk3399.c
> b/drivers/ram/rockchip/sdram_rk3399.c
> index 05ec5fc28d..52518656c4 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -30,7 +30,8 @@ struct chan_info {
>  };
>
>  struct dram_info {
> -#ifdef CONFIG_SPL_BUILD
> +#if defined(CONFIG_TPL_BUILD) || \
> +       (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>         struct chan_info chan[2];
>         struct clk ddr_clk;
>         struct rk3399_cru *cru;
> @@ -55,7 +56,8 @@ struct dram_info {
>  #define PHY_DRV_ODT_40         0xe
>  #define PHY_DRV_ODT_34_3       0xf
>
> -#ifdef CONFIG_SPL_BUILD
> +#if defined(CONFIG_TPL_BUILD) || \
> +       (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>
>  struct rockchip_dmc_plat {
>  #if CONFIG_IS_ENABLED(OF_PLATDATA)
> @@ -1187,7 +1189,8 @@ static int rk3399_dmc_init(struct udevice *dev)
>
>  static int rk3399_dmc_probe(struct udevice *dev)
>  {
> -#ifdef CONFIG_SPL_BUILD
> +#if defined(CONFIG_TPL_BUILD) || \
> +       (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>         if (rk3399_dmc_init(dev))
>                 return 0;
>  #else
> @@ -1226,12 +1229,14 @@ U_BOOT_DRIVER(dmc_rk3399) = {
>         .id = UCLASS_RAM,
>         .of_match = rk3399_dmc_ids,
>         .ops = &rk3399_dmc_ops,
> -#ifdef CONFIG_SPL_BUILD
> +#if defined(CONFIG_TPL_BUILD) || \
> +       (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>         .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata,
>  #endif
>         .probe = rk3399_dmc_probe,
>         .priv_auto_alloc_size = sizeof(struct dram_info),
> -#ifdef CONFIG_SPL_BUILD
> +#if defined(CONFIG_TPL_BUILD) || \
> +       (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>         .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat),
>  #endif
>  };
> --
> 2.20.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>