From patchwork Thu Jun 20 18:54:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119694 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="lh5IPRX3"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45V9yH2gSwz9s3C for ; Fri, 21 Jun 2019 04:56:07 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F0F14C21DC1; Thu, 20 Jun 2019 18:55:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 52FEFC21D72; Thu, 20 Jun 2019 18:55:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A09A1C21BE5; Thu, 20 Jun 2019 18:55:28 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id 3302AC21D56 for ; Thu, 20 Jun 2019 18:55:24 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id v11so2044953pgl.5 for ; Thu, 20 Jun 2019 11:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iJdc+LE+goLm9GBcZ8RQa+EHlJZSHEiVDu4uCr02hoI=; b=lh5IPRX3X/If/l6Bn0jHcl1AZh8H6eMoqpNQ8klq8sWjj65UuOWbrhk4eLr2pueJ3G A7S4pyPPy68tX/J7sO+29bFRe5fVbbZI0ANfnsZuNqKhdhoDb3xeXWDfhKX7YpZUbati Il//sfBH8CXVAk7+F+sJPWF3xoEmKmnSGN7Ic= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iJdc+LE+goLm9GBcZ8RQa+EHlJZSHEiVDu4uCr02hoI=; b=XTJ/0oMHxdMyQpZxzIIER0Q7jtz5NEI/Ri1tbqJMCf5tpPeH2kaAmX0Mamuzc6uqao /zlsELI0jdBs8qx+3MEk9MnNeoeiQKVxZ8ZE8kw2JgNAJ0Xejmd38gQRHsUJuEJfAI5x Stxv/bA08C5zi3N1ejAeIwMO91cmU1/W3yQblb0FSps4qIh6iPJQWl6X4MUA9ed5oUsa jKvTTSuemuDODKdKH/K8Z2pcQV59l+kzv4qg+Hr5SJi7nnIbP1rupqYs3LM7ko3C80Of 3+xtGu7umjUvhE1nathcxrMv5s0GQI2yr8E6phVMjqEtS/b5tk+oLrFHSoTTMjUaL4QI opAA== X-Gm-Message-State: APjAAAUIOsdDCrAuh6pVDiyVOTOA7k1eInxqRFZ0Ao0h8hmqDTd6dsiV LhxFKnNVQ1w+yZoE8nt1fDBZYw== X-Google-Smtp-Source: APXvYqz+L1k6UWHqeqYARj8hU6pjivJYV5tKYRdwW4tW/a+jLsSTR2ca+ylh6UybN8EgNjgyO3sr5A== X-Received: by 2002:a17:90a:ad93:: with SMTP id s19mr1184079pjq.36.1561056922773; Thu, 20 Jun 2019 11:55:22 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:22 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:24:59 +0530 Message-Id: <20190620185506.11449-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 1/8] board: rk3399: Drop explicit uart enablement in spl_board_init X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Kever Yang --- 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 #include #include -#include #include #include #include @@ -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 #include -#include -#include -#include #include #include @@ -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; } From patchwork Thu Jun 20 18:55:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119696 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="EZnVm6BN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45V9zr1jBjz9s3C for ; Fri, 21 Jun 2019 04:57:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D3930C21DCA; Thu, 20 Jun 2019 18:56:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 53A4FC21E16; Thu, 20 Jun 2019 18:55:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC043C21E0F; Thu, 20 Jun 2019 18:55:31 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by lists.denx.de (Postfix) with ESMTPS id 81FE5C21E0F for ; Thu, 20 Jun 2019 18:55:27 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id j2so2168546pfe.6 for ; Thu, 20 Jun 2019 11:55:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9wih55CXddiDKm5F7deTRcQNx2Iu0ElwljLUHTPsi0A=; b=EZnVm6BN+J4QoX72Y0Xd7KU5LuiuMfpOBxFUuui2xxTTJAXWUiI3f1zhED+6OK1uuV hKtSt54abk+3pxbegtq9LBK4QVZlKNgqVR2Bl5qmtAlTWAW3kxP5jjIFZL7vHI/biguW suJoANj9/mgtYTECwOunHCvqPHIcIKVj7p1Xo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9wih55CXddiDKm5F7deTRcQNx2Iu0ElwljLUHTPsi0A=; b=fDWh8yd2ZjtqHqdrgJ4KgP6XzgrUSdV5uonziu862XpqcFdZmqJeoA/IesNCGHtv2k LppS8PnPYud17XDjMbIomyWrkzHSUxo4cYD0Ai1cDXfadkmiJI1jC41SVtU2QvVitGqD fS/f29BxMGAO5s7ywKHTTDIzRgRN328oK5v4linMBfHEdAsjzJQ/TL10pYfcRWEw+SEB +XrXPBDmsGIH/y878laWMMKx/VMYRfwIRjkp00gl0jlIPlwa7fCOfn1y4Sc4nkuOmpVp x3uOhKiQEhsbF29pIPH3jYxJk7fsLVlQL4OaEEqWn442Z/JicFgzyWLb6byO2NOKGro1 w/cA== X-Gm-Message-State: APjAAAU9GI+O5DSvWOc1F8ya98//8nj7GpL4Fa+G+pXNN16YNtkDEYlw rSpPJfwJFYtVIS6osGcNGrHIXw== X-Google-Smtp-Source: APXvYqxAkd6D+xUopzJuy5ThPV0SV82+8zVhGup/VvkeZAfhMJj4pbH9jP++/2D7faoSuoSBe4CRlQ== X-Received: by 2002:a63:231a:: with SMTP id j26mr13869497pgj.389.1561056925968; Thu, 20 Jun 2019 11:55:25 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:25 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:00 +0530 Message-Id: <20190620185506.11449-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 2/8] rockchip: rk3399: Support common spl_board_init X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Support common spl_board_init by moving code from puma board file into, common rk3399-board-spl.c. Part of the code has sysreset-gpio, regulators_enable_boot_on but right now only puma board is using this with relevant config options rest remains common for all targets. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3399-board-spl.c | 63 +++++++++++++++++++ board/rockchip/evb_rk3399/evb-rk3399.c | 8 --- .../puma_rk3399/puma-rk3399.c | 58 ----------------- board/vamrs/rock960_rk3399/rock960-rk3399.c | 8 --- 4 files changed, 63 insertions(+), 74 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index 800ca80022..65c98b697d 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -11,13 +11,16 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include +#include #include void board_return_to_bootrom(void) @@ -202,6 +205,66 @@ void board_init_f(ulong dummy) } } +#if defined(SPL_GPIO_SUPPORT) +static void rk3399_force_power_on_reset(void) +{ + ofnode node; + struct gpio_desc sysreset_gpio; + + debug("%s: trying to force a power-on reset\n", __func__); + + node = ofnode_path("/config"); + if (!ofnode_valid(node)) { + debug("%s: no /config node?\n", __func__); + return; + } + + if (gpio_request_by_name_nodev(node, "sysreset-gpio", 0, + &sysreset_gpio, GPIOD_IS_OUT)) { + debug("%s: could not find a /config/sysreset-gpio\n", __func__); + return; + } + + dm_gpio_set_value(&sysreset_gpio, 1); +} +#endif + +void spl_board_init(void) +{ +#if defined(SPL_GPIO_SUPPORT) + struct rk3399_cru *cru = rockchip_get_cru(); + + /* + * The RK3399 resets only 'almost all logic' (see also in the TRM + * "3.9.4 Global software reset"), when issuing a software reset. + * This may cause issues during boot-up for some configurations of + * the application software stack. + * + * To work around this, we test whether the last reset reason was + * a power-on reset and (if not) issue an overtemp-reset to reset + * the entire module. + * + * While this was previously fixed by modifying the various places + * that could generate a software reset (e.g. U-Boot's sysreset + * driver, the ATF or Linux), we now have it here to ensure that + * we no longer have to track this through the various components. + */ + if (cru->glb_rst_st != 0) + rk3399_force_power_on_reset(); +#endif + +#if defined(SPL_DM_REGULATOR) + /* + * Turning the eMMC and SPI back on (if disabled via the Qseven + * BIOS_ENABLE) signal is done through a always-on regulator). + */ + if (regulators_enable_boot_on(false)) + debug("%s: Cannot enable boot on regulator\n", __func__); +#endif + + preloader_console_init(); +} + #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index 769b5d146f..c600553ff6 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -8,7 +8,6 @@ #include #include #include -#include int board_init(void) { @@ -64,10 +63,3 @@ int board_init(void) out: return 0; } - -void spl_board_init(void) -{ - preloader_console_init(); - - return; -} diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index c6b509c109..251cd2d566 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -13,10 +13,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -38,62 +36,6 @@ int board_init(void) return 0; } -static void rk3399_force_power_on_reset(void) -{ - ofnode node; - struct gpio_desc sysreset_gpio; - - debug("%s: trying to force a power-on reset\n", __func__); - - node = ofnode_path("/config"); - if (!ofnode_valid(node)) { - debug("%s: no /config node?\n", __func__); - return; - } - - if (gpio_request_by_name_nodev(node, "sysreset-gpio", 0, - &sysreset_gpio, GPIOD_IS_OUT)) { - debug("%s: could not find a /config/sysreset-gpio\n", __func__); - return; - } - - dm_gpio_set_value(&sysreset_gpio, 1); -} - -void spl_board_init(void) -{ - int ret; - struct rk3399_cru *cru = rockchip_get_cru(); - - /* - * The RK3399 resets only 'almost all logic' (see also in the TRM - * "3.9.4 Global software reset"), when issuing a software reset. - * This may cause issues during boot-up for some configurations of - * the application software stack. - * - * To work around this, we test whether the last reset reason was - * a power-on reset and (if not) issue an overtemp-reset to reset - * the entire module. - * - * While this was previously fixed by modifying the various places - * that could generate a software reset (e.g. U-Boot's sysreset - * driver, the ATF or Linux), we now have it here to ensure that - * we no longer have to track this through the various components. - */ - if (cru->glb_rst_st != 0) - rk3399_force_power_on_reset(); - - /* - * Turning the eMMC and SPI back on (if disabled via the Qseven - * BIOS_ENABLE) signal is done through a always-on regulator). - */ - ret = regulators_enable_boot_on(false); - if (ret) - debug("%s: Cannot enable boot on regulator\n", __func__); - - preloader_console_init(); -} - static void setup_macaddr(void) { #if CONFIG_IS_ENABLED(CMD_NET) diff --git a/board/vamrs/rock960_rk3399/rock960-rk3399.c b/board/vamrs/rock960_rk3399/rock960-rk3399.c index 018e4b55b8..2eb7120e84 100644 --- a/board/vamrs/rock960_rk3399/rock960-rk3399.c +++ b/board/vamrs/rock960_rk3399/rock960-rk3399.c @@ -6,7 +6,6 @@ #include #include #include -#include int board_init(void) { @@ -18,10 +17,3 @@ int board_init(void) return 0; } - -void spl_board_init(void) -{ - preloader_console_init(); - - return; -} From patchwork Thu Jun 20 18:55:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119698 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="VdsZqfuI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45VB0h0FBjz9s3l for ; Fri, 21 Jun 2019 04:58:11 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A3F46C21DCA; Thu, 20 Jun 2019 18:56:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B9F15C21D9A; Thu, 20 Jun 2019 18:55:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 37450C21C57; Thu, 20 Jun 2019 18:55:35 +0000 (UTC) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by lists.denx.de (Postfix) with ESMTPS id D7645C21DE8 for ; Thu, 20 Jun 2019 18:55:30 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id r7so2178848pfl.3 for ; Thu, 20 Jun 2019 11:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VLoJ5MKcmskZ9kyymQs6hc6FXGkkC+C7DZBiQC4cJ1Q=; b=VdsZqfuIQgcQqqQFpVLn3hDz1kB4VJZYKmZ/zXybEamlu7EPu0aNOyqstiQx2RHFdv qhTFUgQq8GXuH/RtQxYToogFkXMDKMQmOBHw2UtuZDFNCYOogI0AmLz8iYSRj5Z6iSlF Jaqi2LPJDoopvph5S72hppUSRi6bL2KSo9npU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VLoJ5MKcmskZ9kyymQs6hc6FXGkkC+C7DZBiQC4cJ1Q=; b=YBAAkBxY6Z19CnCBc4F9eDLI8X6nzNHpGw4FivDDll5quAgfZTrmTwX5sdo8LciDFg soWpxA3dJ46swR9mx+RgwZM5Ied6YwnXVfCqArqRi5UMAlJtsvXIx15POwLJQpuEzud/ qBO+h2GnCUpi9fXloaPfxKeJstV5yg/JeZJUDULJY/8xssnlLUTBssW0NDA1mMDKSHkl FV7xWZH4GByuYghk8KJUdc9V2fU37k/mEpUZhG1G1oyCswdzmcvTICnArqwIOaHCm3zV 7f29vmmHOfnMKOZJx2ebRzSPPV5MwCsgloP0QOquKCPTyxRDiaEN0jxOWiWkuboGQ7Sv eWug== X-Gm-Message-State: APjAAAXC/vxH+KI600OwKOvTdkHELsSRBzo13SMfe2DxjvsMRd0V+pls /G5othcCEScKfvSM9VAezNPMmA== X-Google-Smtp-Source: APXvYqz7LjL122xz1xSpnzhUJWvQk+MH0tQNYY4m89wyUUJCfVjdyuxoAmBYyPmh/jdFtph1XjB9sg== X-Received: by 2002:a62:2ccc:: with SMTP id s195mr4767061pfs.256.1561056929497; Thu, 20 Jun 2019 11:55:29 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:29 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:01 +0530 Message-Id: <20190620185506.11449-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 3/8] rockchip: rk3399: spl: Mark printascii into debug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now, we have spl_board_init with preloader_console_init that indeed show SPL banner. So mark the 'U-Boot SPL board init' print into debug. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3399-board-spl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c index 65c98b697d..890d80025f 100644 --- a/arch/arm/mach-rockchip/rk3399-board-spl.c +++ b/arch/arm/mach-rockchip/rk3399-board-spl.c @@ -164,7 +164,7 @@ void board_init_f(ulong dummy) * printhex8(0x1234); * printascii("string"); */ - printascii("U-Boot SPL board init\n"); + debug("U-Boot SPL board init\n"); #endif ret = spl_early_init(); From patchwork Thu Jun 20 18:55:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119695 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="o5EyLc1x"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45V9yV2ZN9z9s3C for ; Fri, 21 Jun 2019 04:56:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F318AC21C38; Thu, 20 Jun 2019 18:55:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B59F2C21DB3; Thu, 20 Jun 2019 18:55:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6ADD7C21C8B; Thu, 20 Jun 2019 18:55:37 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by lists.denx.de (Postfix) with ESMTPS id EEDF4C21E35 for ; Thu, 20 Jun 2019 18:55:33 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id k8so1758037plt.3 for ; Thu, 20 Jun 2019 11:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ejKhZV0ZePK8koi6sjYi9JqAEP6CgbDzTjWopYnMhJU=; b=o5EyLc1xl8bVH99jHLZ0p9F10DbjZZbC+As0NAnUP8LYJ3OnXPEzJ2QLOPCL5TRaK9 ggujMG4C7wSEhKa7k5UaJJdAYpWfrJDdMxX49Zcg9t7zLYAiClrgcbvfZbfGZdjkLA0T p+2o0tZyPb4BhM6JG8FxSkrKqOqT4kLtnWVvw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ejKhZV0ZePK8koi6sjYi9JqAEP6CgbDzTjWopYnMhJU=; b=A9RbGTKeXXijLIfwHliMojJ0kO1S3C2Iatj8RtDyt0GbHg/vPUCQJjEt9Ut397Gwz0 NSHzA+PE66YMnPmfhJ6RZNiw0XxxZ698jchhb6LgznRKOldfbJ1WezldH9/WtaJFrp1L K66np3euO/iGjmrBTMwhAhBEQ2S8iqpApYbDarGf7gZwYrbUbgPvSwP7n+iG6Ahx0RjR 5bmt0QsyEvNdlL0xctZucKOCQXQ2o+Ij1zX+9Ac2AOwW2DdZflgDXa3TvpMeHci98OY2 rssnZwyukVcmIXkYQPgGNixXgv2huFZb8uoaVdwd2wUaqHKqwEhF81HtTuqxOsardxJv IEiQ== X-Gm-Message-State: APjAAAUT4DuGrR47WbSQ7YkhHABH7fQVlMh5WxbEpfLPCeduAvoTAiMZ 9DwJFU0pmqYq5e2c9U1aGgtccw== X-Google-Smtp-Source: APXvYqwqH1dlISIogR6VE2TS9sLz8RW2JahvbydDHQPus8facOlM7DiRYVaMCRoz/FVz/L7wMRW3Vw== X-Received: by 2002:a17:902:2aab:: with SMTP id j40mr83356445plb.76.1561056932569; Thu, 20 Jun 2019 11:55:32 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:32 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:02 +0530 Message-Id: <20190620185506.11449-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 4/8] rockchip: rk3399: Move u-boot, dm-pre-reloc of uart0, uart2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" u-boot,dm-pre-reloc for uart0, uart2 indeed u-boot specific properties. Move them into rk3399-u-boot.dtsi so the boards which enabled these node will available during SPL. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-gru.dtsi | 1 - arch/arm/dts/rk3399-puma.dtsi | 1 - arch/arm/dts/rk3399-u-boot.dtsi | 8 ++++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk3399-gru.dtsi b/arch/arm/dts/rk3399-gru.dtsi index ca0fc391b2..0e2e047180 100644 --- a/arch/arm/dts/rk3399-gru.dtsi +++ b/arch/arm/dts/rk3399-gru.dtsi @@ -629,7 +629,6 @@ ap_i2c_audio: &i2c8 { &uart2 { status = "okay"; - u-boot,dm-pre-reloc; }; &usb_host0_ohci { diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 897e0bda85..74368da550 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -639,7 +639,6 @@ }; &uart0 { - u-boot,dm-pre-reloc; pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts>; status = "okay"; diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi index 0786c1193a..fcfce9ae02 100644 --- a/arch/arm/dts/rk3399-u-boot.dtsi +++ b/arch/arm/dts/rk3399-u-boot.dtsi @@ -10,3 +10,11 @@ &spi1 { u-boot,dm-pre-reloc; }; + +&uart0 { + u-boot,dm-pre-reloc; +}; + +&uart2 { + u-boot,dm-pre-reloc; +}; From patchwork Thu Jun 20 18:55:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119702 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="GQc1ZbZL"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45VB102ZYSz9s4V for ; Fri, 21 Jun 2019 04:58:28 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 00F17C21DAF; Thu, 20 Jun 2019 18:56:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 13130C21DF3; Thu, 20 Jun 2019 18:55:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0BEAFC21DA6; Thu, 20 Jun 2019 18:55:37 +0000 (UTC) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by lists.denx.de (Postfix) with ESMTPS id 0ED44C21D9A for ; Thu, 20 Jun 2019 18:55:37 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id m7so1744613pls.8 for ; Thu, 20 Jun 2019 11:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IXklBQ6ai0O2AEMFHBbAi493eYh613acLhwbCyGgVi0=; b=GQc1ZbZLNzRrhUw1UDUak/4hlO4uo2VunMMv6KSdDDcUoPpAzv1w6KCcjpy7bIBUrj XD5Lu01xG7v7Q9WJI1uyaOjorNqqEMePc4MiQXJj/SJPgyKkxUN4gqfNaRapDSfu2z7D i7SVP6w62qfQQpnkTf2TkhzUfdJ8Xut1YkNrI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IXklBQ6ai0O2AEMFHBbAi493eYh613acLhwbCyGgVi0=; b=jvBQrX2T5URYjvBg1Hv/nDq5oUBFE1N0vXz6uBiIeHwHpRX398InKGCxnP3PG82s9p r7zfRau5RwAj3eKGs3Td8UzL81RUCM4fLnTB7jRtOfAUzX/At0tUv/bnN/8VLbIdBiTS 0tNd/ucgPvvzN0zunTqOjFEbAZy46CxUMFFIeF9uXCHmDO32dgW3fI04doN5AvLhelUe FLBEisTMV3+ilNWKFF0IE6TpNhx0TmNGUlEtn07gEFnkugQ1QBAbDzeeVgTHZEUeQdRQ 6fnYLAoXehJx24EBojrrf7M3N/HueMdzkanyyy1ThkK/P+odD/YBRQc4ou9h1l2cZfCE iNbg== X-Gm-Message-State: APjAAAUQZCC/uKlvDVdoosmI1k9VVywpwj4LZ2XMU+bayPPWdbnpkw7B rZ2La6TtS5CwR7LH9L6vRXy42Q== X-Google-Smtp-Source: APXvYqzAmLSV3CpRpWZYcriyISJkD7of1RbSt1WgZchzbf+dJpvDUkpsRoL8nhX/2y7HEF+OhnVznA== X-Received: by 2002:a17:902:1e9:: with SMTP id b96mr80242148plb.277.1561056935646; Thu, 20 Jun 2019 11:55:35 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:35 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:03 +0530 Message-Id: <20190620185506.11449-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 5/8] rockchip: rk3399: Enable SPL_BOARD_INIT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable SPL_BOARD_INIT globally to rk3399, this would help to print the SPL banner during bootup. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/Kconfig | 1 + configs/puma-rk3399_defconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index c05e3c3f48..ce039022df 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -158,6 +158,7 @@ config ROCKCHIP_RK3399 select SPL select SPL_ATF select SPL_ATF_NO_PLATFORM_PARAM if SPL_ATF + select SPL_BOARD_INIT if SPL select SPL_LOAD_FIT select SPL_CLK if SPL select SPL_PINCTRL if SPL diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index ebc78fb216..5cb2273a15 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -21,7 +21,6 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_TEXT_BASE=0xff8c2000 -CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y From patchwork Thu Jun 20 18:55:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119703 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="UYXRB88I"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45VB1s3bp6z9s3l for ; Fri, 21 Jun 2019 04:59:13 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 32C5BC21DEC; Thu, 20 Jun 2019 18:57:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 13062C21DAF; Thu, 20 Jun 2019 18:56:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D65AFC21D56; Thu, 20 Jun 2019 18:55:43 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id 37B8AC21DFB for ; Thu, 20 Jun 2019 18:55:40 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id m7so1744649pls.8 for ; Thu, 20 Jun 2019 11:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kD+oEPKanpwbUqT7qImxj7fv4DhkmQG/0AnVoyVwb8k=; b=UYXRB88IRdD4LO1+UjCZMQoCTWH+rCo/z8yUb+7V9apqr/3fM7y1P8zCOZmiN1TMWr l6wkeMUWdSJBf4f1bJD6hFJJtCSTAZrf5Rz6UvGfd10lupdcpOpNhCbq8Pfm34AjFOtm PLE9QDxa5mJPr+T+L2nL8bqrQq+TcmcqVjcIc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kD+oEPKanpwbUqT7qImxj7fv4DhkmQG/0AnVoyVwb8k=; b=IsH3JazMxN8de6y0HQQcuBJaQtQVFESSpQMHFA3djUP2QwXfhUH6MBZwoTkWGpdEwy B/TW19vKO1L3ZOIH6LHM9qwdaITWyfJl5BLeBDYM0SnnQ7Osuxpo5Su6HZBpaOmtCSxL BXutGcGPhmTRassJICQlAfpobWeCfx8J1oZYFkltPXtjXkw6SXjtDKUEKgI2l88LoAq3 Do33MUSPNusA+81rLaq6dHmW9cvpZO/8VbdE8DtcsxzaH9/+0iNis3yBvwxKQM1hsKUe /35Wkhrh7bSUV1umYVFM4B73dqv4rgLEloakwdT08cDGBnXP9YAdzLaAIVyFJbGGWcA9 P8oQ== X-Gm-Message-State: APjAAAUftg3KyYxv8EiSMSX6xdrl4XA5KQCXGCUnIhNgcjY6s2xlrm4S luqVTXbh4CCXw1abBq+3F/ICGA== X-Google-Smtp-Source: APXvYqzsGSMpnbkvOOIY7YD/2WnkN9wt64TzUkMLxMgd0DtjuU9fwd5cedvLN6y59zeZeXHYAR9bTA== X-Received: by 2002:a17:902:6947:: with SMTP id k7mr52379067plt.253.1561056938788; Thu, 20 Jun 2019 11:55:38 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:38 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:04 +0530 Message-Id: <20190620185506.11449-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 6/8] rockchip: rk3399: tpl: Add spl_board_init X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add spl_board_init for TPL, that have TPL banner will help to print tpl boot prints. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3399-board-tpl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-rockchip/rk3399-board-tpl.c b/arch/arm/mach-rockchip/rk3399-board-tpl.c index 86d3ffe97c..72d0dd914e 100644 --- a/arch/arm/mach-rockchip/rk3399-board-tpl.c +++ b/arch/arm/mach-rockchip/rk3399-board-tpl.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -73,6 +74,12 @@ u32 spl_boot_device(void) return BOOT_DEVICE_BOOTROM; } +void spl_board_init(void) +{ + puts("\nU-Boot TPL " PLAIN_VERSION " (" U_BOOT_DATE " - " + U_BOOT_TIME " " U_BOOT_TZ ")\n"); +} + #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { From patchwork Thu Jun 20 18:55:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119697 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="YODei6VU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45V9zw1JXxz9s3C for ; Fri, 21 Jun 2019 04:57:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DCBDFC21C38; Thu, 20 Jun 2019 18:56:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8797FC21D8E; Thu, 20 Jun 2019 18:56:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 99FB6C21D56; Thu, 20 Jun 2019 18:55:47 +0000 (UTC) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by lists.denx.de (Postfix) with ESMTPS id 905E0C21DA6 for ; Thu, 20 Jun 2019 18:55:43 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id q10so2163586pff.9 for ; Thu, 20 Jun 2019 11:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rmGkWdUXEAN+u9N24/e8pZdAG3S+WpbqZafK0k9TbvA=; b=YODei6VUPdE0C3oFm9KyqHhgzAo53YPxNqANHugtrVToZRSZP6nikcH+w+S7V8+/1X Yovwr/8zNgnOHQOqHBEI/MrqI2FFWTmwAPopzioT94oBfINZibVxw8rHKBrjfG78tTXL NOfSVAjSbeeKQH8dRkSskxSE1qn0r9PaERadw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rmGkWdUXEAN+u9N24/e8pZdAG3S+WpbqZafK0k9TbvA=; b=aRHY+0tR2aeWEOwSrWGB3kBCSXVaqLoCh5PRrbc6C7vVaVR0I417GsPQatN8Bsr5yh oRaGjseolqfSZ3zL60zTt5N64ISQa1/oqUxS2Q2VMoTY+J8vbOPdqfXN2a9+WF3vcX06 ffshMSsO5+Kc6m6cFK9eQFE+ZGBmzcwFDuFTHWexYGLff+wAzzORnyRl8OYeGCru3aeJ evtg9PkdglyXWowtmfoEEjSDkI2D+9MVXAjlDWgKNeKNxOx0T4vSsClOFEEKkuN5R1Bt eHnzxl/Qg6hGRwCgPig/V8QIhmVT//vhNF3xVEunYPcApxf8pvKzVnLexcYAc3JL6uhe jUlQ== X-Gm-Message-State: APjAAAXPhTTxuN/cA6bYiM9Fk1z2+p/7E0YcvNAQKJpgHf85WEmpuHGZ 8YwfGjrJx9skIPs9Y+JAyKAFKA== X-Google-Smtp-Source: APXvYqz5exAY1k4y4+1/NQY7S/fntSiRze5BKE6rAcGn57awlqED5u8+YrxK7Fe7P/X1tl2ISj3sxA== X-Received: by 2002:a17:90a:3086:: with SMTP id h6mr1213422pjb.14.1561056942166; Thu, 20 Jun 2019 11:55:42 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:41 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:05 +0530 Message-Id: <20190620185506.11449-8-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 7/8] rockchip: rk3399: tpl: Mark printascii into debug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Now, we have spl_board_init which has TPL banner prints. So mark the 'U-Boot TPL board init' print into debug. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/rk3399-board-tpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/rk3399-board-tpl.c b/arch/arm/mach-rockchip/rk3399-board-tpl.c index 72d0dd914e..4a301249b4 100644 --- a/arch/arm/mach-rockchip/rk3399-board-tpl.c +++ b/arch/arm/mach-rockchip/rk3399-board-tpl.c @@ -47,7 +47,7 @@ void board_init_f(ulong dummy) * printhex8(0x1234); * printascii("string"); */ - printascii("U-Boot TPL board init\n"); + debug("U-Boot TPL board init\n"); #endif ret = spl_early_init(); if (ret) { From patchwork Thu Jun 20 18:55:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1119699 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="J3Co9Iqj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45VB0q1zR2z9s3l for ; Fri, 21 Jun 2019 04:58:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E1C58C21DCA; Thu, 20 Jun 2019 18:57:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,T_DKIM_INVALID autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8D5E9C21DED; Thu, 20 Jun 2019 18:56:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D6EC5C21E02; Thu, 20 Jun 2019 18:55:50 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id C03A7C21E12 for ; Thu, 20 Jun 2019 18:55:46 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id w10so2037724pgj.7 for ; Thu, 20 Jun 2019 11:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YAVX44TjixlyUBQzD0G7+JGPLwAIIoO4XVm2kwePVsI=; b=J3Co9Iqj/Uahf9I/LYllSovtu5292resySUkJhy2CATyEb8fHSHvLG27AeV3mSLuC3 bYqqNUW4qiPBQtF7MgaonpEhUgoFUsqDztBLotnkJUYZ0p6qJhJq4kFmL6FxiORyV3ab 3egxW90u3IlKkRfUrTX/uXSD5GbkCXtuUDe6M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YAVX44TjixlyUBQzD0G7+JGPLwAIIoO4XVm2kwePVsI=; b=MJZ+QutRo1h6zIOgCiCfl22hTPzaSdc3rpt5EVnk8DoGwrO7FV4xq7BzT3c/NuBSSh HqaZPuCYGjOzBW2wUFYkbnPIrq7M9c8CwUZ2aZnRNvxKB4vdqtHf3YKiL+Iaef5PQXRh +OPhNaIPZPBjEVd2IqnIH+LweWlEjhm/9wAot9pxFVFR6NmBMSiBHCXRXJN+mPLEE8ay B3TF1GuX+uzU6gLAX1L+/HKlBnbJe69SsnnIgcZrwpZf0TusZ2RFDfTu6wsthiw4Xj2K aYHIuPY9HYfwRTVOaXcWGBpW0Ti0FX+9YZH42GqNoa3w3pppDyzh0bzK4anZP4RNPDVV JtkQ== X-Gm-Message-State: APjAAAUmX1FThN2WxtIlez9/yBt5omqtFhKXP18LK07ngmiFvGtszqq8 X5Dr+zzJfv4W2O64Njy0/5TSKQ== X-Google-Smtp-Source: APXvYqx2KN4/aWVpMa6gmNLJWrp8NXPCOSnQnsYaSPsMQWxhCnvD2Gd3y4f9p+aaAHxuiX/0z/FKPg== X-Received: by 2002:a63:4c14:: with SMTP id z20mr14096286pga.360.1561056945317; Thu, 20 Jun 2019 11:55:45 -0700 (PDT) Received: from localhost.localdomain ([183.82.225.128]) by smtp.gmail.com with ESMTPSA id k3sm372183pju.27.2019.06.20.11.55.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jun 2019 11:55:44 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , u-boot@lists.denx.de Date: Fri, 21 Jun 2019 00:25:06 +0530 Message-Id: <20190620185506.11449-9-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190620185506.11449-1-jagan@amarulasolutions.com> References: <20190620185506.11449-1-jagan@amarulasolutions.com> MIME-Version: 1.0 Cc: linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com Subject: [U-Boot] [PATCH v2 8/8] rockchip: rk3399: Enable TPL_BOARD_INIT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable TPL_BOARD_INIT, this would help us to show TPL boot prints. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- arch/arm/mach-rockchip/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index ce039022df..1d483be8b9 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -184,6 +184,7 @@ config ROCKCHIP_RK3399 imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBGENERIC_SUPPORT imply TPL_SYS_MALLOC_SIMPLE + imply TPL_BOARD_INIT imply TPL_BOOTROM_SUPPORT imply TPL_DRIVERS_MISC_SUPPORT imply TPL_OF_CONTROL