Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rockchip: rk3399: Migrate to use common board file

Browse source 
Use common board file for board_init() and board_late_init(),
for Rockchip SoCs have very similar process.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-07-22 20:02:19 +08:00
parent 54b012fd96
commit 920b01388e
7 changed files with 1 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-rockchip/Kconfig
View file

@ -177,6 +177,7 @@ config ROCKCHIP_RK3399
select DM_PMIC
select DM_REGULATOR_FIXED
select BOARD_LATE_INIT
imply ROCKCHIP_COMMON_BOARD
imply SPL_ROCKCHIP_COMMON_BOARD
imply TPL_SERIAL_SUPPORT
imply TPL_LIBCOMMON_SUPPORT

1
arch/arm/mach-rockchip/Makefile
View file

@ -22,7 +22,6 @@ ifeq ($(CONFIG_SPL_BUILD)$(CONFIG_TPL_BUILD),)
obj-y += boot_mode.o
obj-$(CONFIG_ROCKCHIP_COMMON_BOARD) += board.o
obj-$(CONFIG_ROCKCHIP_RK3399) += rk3399-board.o
obj-$(CONFIG_ROCKCHIP_RV1108) += rv1108-board.o
endif

13
arch/arm/mach-rockchip/rk3399-board.c
View file

@ -1,13 +0,0 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* Copyright (c) 2017 Rockchip Electronics Co., Ltd
*/
#include <common.h>
#include <asm/arch-rockchip/boot_mode.h>
int board_late_init(void)
{
setup_boot_mode();
return 0;
}

5
board/google/gru/gru.c
View file

@ -5,11 +5,6 @@
#include <common.h>
int board_init(void)
{
return 0;
}
#ifdef CONFIG_SPL_BUILD
/* provided to defeat compiler optimisation in board_init_f() */
void gru_dummy_function(int i)

13
board/rockchip/evb_rk3399/evb-rk3399.c
View file

@ -5,7 +5,6 @@
#include <common.h>
#include <dm.h>
#include <dm/pinctrl.h>
#include <asm/arch-rockchip/periph.h>
#include <power/regulator.h>
@ -28,16 +27,4 @@ int board_early_init_f(void)
out:
return 0;
}
int board_init(void)
{
struct udevice *regulator;
int ret;
ret = regulators_enable_boot_on(false);
if (ret)
debug("%s: Cannot enable boot on regulator\n", __func__);
return 0;
}
#endif

15
board/theobroma-systems/puma_rk3399/puma-rk3399.c
View file

@ -21,21 +21,6 @@
#include <power/regulator.h>
#include <u-boot/sha256.h>
int board_init(void)
{
int ret;
/*
* We need to call into regulators_enable_boot_on() again, as the call
* during SPL may have not included all regulators.
*/
ret = regulators_enable_boot_on(false);
if (ret)
debug("%s: Cannot enable boot on regulator\n", __func__);
return 0;
}
static void setup_macaddr(void)
{
#if CONFIG_IS_ENABLED(CMD_NET)

15
board/vamrs/rock960_rk3399/rock960-rk3399.c
View file

@ -2,18 +2,3 @@
/*
* Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
*/
#include <common.h>
#include <dm.h>
#include <power/regulator.h>
int board_init(void)
{
int ret;
ret = regulators_enable_boot_on(false);
if (ret)
debug("%s: Cannot enable boot on regulator\n", __func__);
return 0;
}