From: Jagan Teki <jagan@amarulasolutions.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/8] board: rk3399: Drop explicit uart enablement in spl_board_init
Date: Wed, 8 May 2019 13:38:57 +0530 [thread overview]
Message-ID: <20190508080904.1567-2-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20190508080904.1567-1-jagan@amarulasolutions.com>
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>
---
board/rockchip/evb_rk3399/evb-rk3399.c | 23 +------------------
board/vamrs/rock960_rk3399/rock960-rk3399.c | 25 +--------------------
2 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c
index bf2ad98c47..769b5d146f 100644
--- a/board/rockchip/evb_rk3399/evb-rk3399.c
+++ b/board/rockchip/evb_rk3399/evb-rk3399.c
@@ -6,7 +6,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>
@@ -68,27 +67,7 @@ out:
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;
}
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;
}
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2019-05-08 8:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-08 8:08 [U-Boot] [PATCH 0/8] rockchip: rk3399: Use spl_board_init in SPL, TPL Jagan Teki
2019-05-08 8:08 ` Jagan Teki [this message]
2019-05-08 8:08 ` [U-Boot] [PATCH 2/8] rockchip: rk3399: Support common spl_board_init Jagan Teki
2019-05-08 8:08 ` [U-Boot] [PATCH 3/8] rockchip: rk3399: spl: Mark printascii into debug Jagan Teki
2019-05-08 8:09 ` [U-Boot] [PATCH 4/8] rockchip: rk3399: Move u-boot, dm-pre-reloc of uart0, uart2 Jagan Teki
2019-05-08 8:09 ` [U-Boot] [PATCH 5/8] rockchip: rk3399: Enable SPL_BOARD_INIT Jagan Teki
2019-05-08 8:09 ` [U-Boot] [PATCH 6/8] rockchip: rk3399: tpl: Add spl_board_init Jagan Teki
2019-05-08 8:09 ` [U-Boot] [PATCH 7/8] rockchip: rk3399: tpl: Mark printascii into debug Jagan Teki
2019-05-08 8:09 ` [U-Boot] [PATCH 8/8] rockchip: rk3399: Enable TPL_BOARD_INIT Jagan Teki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190508080904.1567-2-jagan@amarulasolutions.com \
--to=jagan@amarulasolutions.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox