summaryrefslogtreecommitdiff
path: root/board/vamrs/rock960_rk3399
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2019-06-21 00:24:59 +0530
committerKever Yang <kever.yang@rock-chips.com>2019-06-26 21:11:27 +0800
commit9f5a9f9ad3f96bd252b0d011ee4b6e89358ca494 (patch)
tree10b26c4485bc6212f818e6d306f28cd8755f4b29 /board/vamrs/rock960_rk3399
parent1c281dc2baf1615baae91783801665bfa70fb767 (diff)
board: rk3399: Drop explicit uart enablement in spl_board_init
preloader_console_init is used for printing SPL boot banner that usually called from spl_board_init. The current spl_board_init in evb and rock960 is enabling explicit pinctrl, debug uart prior to calling preloader_console_init which eventually not required since board_init_f is already enabled debug uart. So, drop those explicit enablement calls from spl_board_init of evb, rock960. Tested this by enabling CONFIG_SPL_BOARD_INIT and adding u-boot,dm-pre-reloc property for uart node. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'board/vamrs/rock960_rk3399')
-rw-r--r--board/vamrs/rock960_rk3399/rock960-rk3399.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/board/vamrs/rock960_rk3399/rock960-rk3399.c b/board/vamrs/rock960_rk3399/rock960-rk3399.c
index 0f5ef3a09a..018e4b55b8 100644
--- a/board/vamrs/rock960_rk3399/rock960-rk3399.c
+++ b/board/vamrs/rock960_rk3399/rock960-rk3399.c
@@ -5,9 +5,6 @@
#include <common.h>
#include <dm.h>
-#include <dm/pinctrl.h>
-#include <dm/uclass-internal.h>
-#include <asm/arch-rockchip/periph.h>
#include <power/regulator.h>
#include <spl.h>
@@ -24,27 +21,7 @@ int board_init(void)
void spl_board_init(void)
{
- struct udevice *pinctrl;
- int ret;
-
- ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
- if (ret) {
- debug("%s: Cannot find pinctrl device\n", __func__);
- goto err;
- }
-
- /* Enable debug UART */
- ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_UART_DBG);
- if (ret) {
- debug("%s: Failed to set up console UART\n", __func__);
- goto err;
- }
-
preloader_console_init();
- return;
-err:
- printf("%s: Error %d\n", __func__, ret);
- /* No way to report error here */
- hang();
+ return;
}