[U-Boot] [PATCH v2 1/8] board: rk3399: Drop explicit uart enablement in spl_board_init

Kever Yang
2019-06-22T13:45:43Z

Hi Jagan,

On 06/21/2019 02:54 AM, Jagan Teki wrote:
> 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>

Thanks,
- Kever
> ---
> 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;
> }