From patchwork Mon Jun 8 18:17:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11593783 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1559E739 for ; Mon, 8 Jun 2020 18:17:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E165520775 for ; Mon, 8 Jun 2020 18:17:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kQEX4bUw"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="Yo6Ldylo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E165520775 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wOxQImu/7owD29fHSotR46fqjC1Q71+bXaW18Vbbuo8=; b=kQEX4bUwPjg2rZ pfyhh8S/HpJLvA1IqKTswq6WExYdvrmw5QA23SJE1OiPVu0LFNs0GF/nPosVp1nd+O93htTTlG7BV GDqqyqCmceN8thQULaNuA42f+xx13LPL5InM6kx7yHj3sSO1BlMywTB8B05ABdINc4F9RnFgQHRsY KQJ6IkHzsg7/q3u1WBBufH3tRcokQRrnxFaaE606GhgGGF3cWmPYI0Ryy9W+EyXRw3u00yUUj+VOT RvkrT6VqoZ8f5lUI0aNDx8fp9JUpGNqDNeEvL39JK4E3nbAWXnpDAZMEOIr7py6Ut+fzcRxP857Lk gez/vD0iINZCcakoW7nA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiMKt-0002dj-J2; Mon, 08 Jun 2020 18:17:27 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiMKr-0002cR-Od for linux-rockchip@lists.infradead.org; Mon, 08 Jun 2020 18:17:27 +0000 Received: by mail-pf1-x444.google.com with SMTP id h185so8898529pfg.2 for ; Mon, 08 Jun 2020 11:17:25 -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=rqXEXm0tb4ZEKQl4MRX0HDHcSNYC6CGgq8tXMrLZibo=; b=Yo6LdyloW7Y+CWEp8OdPSDYaZ2RCbtBPY1qBCBgtwD69gx26lj8ICS43g4WOMjDcGv Si1WQJvq2ojOFTdm2vmEZEibupf/afw50ESM1XXKkiLqEusn1i0+TCJ6GHbOvttFm0BN +Ut+OTPOeiBrj9UkrQNvx6lu45FsxUDPtqT/c= 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=rqXEXm0tb4ZEKQl4MRX0HDHcSNYC6CGgq8tXMrLZibo=; b=fwlWmQkEIm6MhRSxa1YEoQ1zl3Sz8B/F8ynK1z+tvsVYUl3KJI8zrgGQAMLuBOY7qC In3uT3QI9QycFsavYa/43uUGBifnoO1eFxssWuWjCP+SVV/ZkVA4KtQycw52yD4/U2X4 hp7of5PdnlvT987r1BtyqMP5I9LlPxZnFg+/MR4HZ2BoM6RQ+GQOF5PIcqp7MvnOLmTW scYABzfvOXJcs3cB7q7NQmsTtv3VZgmEpBCldl8Ope+T2l/+m+ZWSI3xxBzFKSKVI441 NAWaenO3fOxsKWidJc+4dXIyyPOvaUj9GJcqERHHI1q6FhmdoQZy2x5gs1fk6og5+UJW eRCA== X-Gm-Message-State: AOAM532Z4aLQqlWy/Mlx+96V+Dxw57Vch/g3t8AdidN42+QzZwW750LD YRwckopkGbd/FZXVVlRgTOw0Tw== X-Google-Smtp-Source: ABdhPJzOHdEwfHhi/5tP7IIEeoH4ma+VO7IYSHebOtpoQVpGRlYJqKgrgrHXwJAkvdYwK5vwEIUbUQ== X-Received: by 2002:a63:c501:: with SMTP id f1mr9536927pgd.324.1591640245008; Mon, 08 Jun 2020 11:17:25 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9043:af95:b7b4:3ade]) by smtp.gmail.com with ESMTPSA id t7sm180213pju.42.2020.06.08.11.17.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 11:17:24 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Subject: [PATCH v4 1/4] Makefile: Drop to handle rkspi image type Date: Mon, 8 Jun 2020 14:17:05 -0400 Message-Id: <20200608181708.17842-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608181708.17842-1-jagan@amarulasolutions.com> References: <20200608181708.17842-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_111725_798468_69AE024B X-CRM114-Status: UNSURE ( 7.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki , Suniel Mahesh Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org On rockchip platforms, SPI boot image creation is not straightforward like MMC boot image creation where former requires to specify tpl, spl in multimage format in mkimage, and later simply do a concatenate mkimaged-tpl with spl. On this note, let drop rkspi image type creation via kbuild and let inform via rockchip.rst Reviewed-by: Kever Yang Signed-off-by: Jagan Teki --- Changes for v4: - none Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 3851dd9fa0..db3b6b9991 100644 --- a/Makefile +++ b/Makefile @@ -1438,22 +1438,15 @@ u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE ifeq ($(CONFIG_ARCH_ROCKCHIP),y) -# rockchip image type -ifeq ($(CONFIG_SPL_SPI_LOAD),y) -ROCKCHIP_IMG_TYPE := rkspi -else -ROCKCHIP_IMG_TYPE := rksd -endif - # TPL + SPL ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy) -MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) +MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE $(call if_changed,mkimage) idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE $(call if_changed,cat) else -MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T $(ROCKCHIP_IMG_TYPE) +MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd idbloader.img: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) endif From patchwork Mon Jun 8 18:17:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11593785 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CCC19912 for ; Mon, 8 Jun 2020 18:17:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A9BC120775 for ; Mon, 8 Jun 2020 18:17:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="R9Hy/vQ/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="BqSAR8s6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9BC120775 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UEW3d4iOAqr7zUmqI7M6JcuC9SoSv5Vu1/+vFvsgkxU=; b=R9Hy/vQ/OcngUp aLp4eqsewxAHtQVMaO1UBkYyY+1fs3zE7xA+RN7DtGr0DUiV5x0vmd45cWpdnAyQLg91ogK0u06lb zMrX1chFSZyMokqbYM27QbE0RTMdlnYfc0RNjVt2JRY5p9kGgBxhIr4+P3Q2hndp1SIH9vpIDsqch PE7g8ruMi6y/qAXJjByxxx+9GBoSM9eh0xpLM5NjmWpjYiMPP6sYqDeg6+ypeNmq86ei+nIbHsJjf 170VL6B2lncGTQ77Kju97ivyxpINicLA1CoblpKDg+LmFka0hCSlOcdGt8yTkGomTbwB/lBIZNi/w euGabOOr6kgXu2EGpv+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiMKz-0002h8-91; Mon, 08 Jun 2020 18:17:33 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiMKw-0002fl-Hp for linux-rockchip@lists.infradead.org; Mon, 08 Jun 2020 18:17:31 +0000 Received: by mail-pg1-x543.google.com with SMTP id o6so9132909pgh.2 for ; Mon, 08 Jun 2020 11:17: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=bQNlycZ9vokq5UGlruxRZJSdM1/o76P/8ylJFTjzz5Y=; b=BqSAR8s6Xyp+rWNpCDBKnKmRi+eIbmPkSP820A6gE1fF6//bhjOGJBrMA1hvL6x0g/ 4J24k+przaLVg65w3yQvGNs6k5mB83xfRlOIfMyemEgw1c4GDL/e1Uva3SuPVWLys4Dj Eb6GtswWlbaOX+LNHv/SADBqafd5jJo7K5xLc= 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=bQNlycZ9vokq5UGlruxRZJSdM1/o76P/8ylJFTjzz5Y=; b=aCIv9thEPaExpVR00gLUvNER/TAFLKGWR8FrlphIkbCznMEuai/GE7bmR7tguZo4MZ DjYz6/82fNya3SStvje3ZAjcPb6PgDFha7Iu99culgXYPwLCvOTkAQNnPrkm2GluYUMr W1aJr0Bz3qhC4Vxu3R8YHwH/eOVcz9k3sSYx+6GACXyQSvkYSk4/5Ru0SbgKayhSMwlA 7cyVmgpoYrrVqpwHVbOdOurw/g/qOx+FAOzV6eSEH2lxRIT+Znf1Gzx0r6Xi1J2QBulV pglgY3khvQbumUuSDPYVcHAdihv2CzG0sZ6vK1mUceeKAsm/N6U9XARIPcuUt1UOvEVc 6dBw== X-Gm-Message-State: AOAM533ZvvBlOxp/qvvIzRdIZ+hAxLxOvKb7OVxb04AgS0TwjyQ/f7fQ sTCZoezfTcSA/vVvuHY6kv15fg== X-Google-Smtp-Source: ABdhPJzCP7A7vxDgUsupIbzY9UZ0eK8ynFpJ0tFS+MocyPEuYqmvkwO3iXVuRpS5WOLeGcd+WfIAmw== X-Received: by 2002:a63:4a1d:: with SMTP id x29mr20750552pga.53.1591640249774; Mon, 08 Jun 2020 11:17:29 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9043:af95:b7b4:3ade]) by smtp.gmail.com with ESMTPSA id t7sm180213pju.42.2020.06.08.11.17.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 11:17:29 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Subject: [PATCH v4 2/4] roc-rk3399-pc: Mark default env from SPI Date: Mon, 8 Jun 2020 14:17:06 -0400 Message-Id: <20200608181708.17842-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608181708.17842-1-jagan@amarulasolutions.com> References: <20200608181708.17842-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_111730_590745_170997FC X-CRM114-Status: UNSURE ( 7.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki , Suniel Mahesh Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Mark the default U-Boot environment as SPI flash since this is an on board flash device. Updated env offset, size in contrast with default since the U-Boot proper has starting from 384K. Signed-off-by: Jagan Teki --- Changes for v4: - adjust env offset, size configs/roc-pc-mezzanine-rk3399_defconfig | 4 +++- configs/roc-pc-rk3399_defconfig | 4 +++- include/configs/roc-pc-rk3399.h | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index 1c1539bcb9..9c6fd0c98c 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 @@ -25,7 +27,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc-mezzanine" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index 76e76c160e..b225eb38fe 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -1,7 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_TEXT_BASE=0x00200000 +CONFIG_ENV_SIZE=0x8000 CONFIG_ENV_OFFSET=0x3F8000 +CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_ROCKCHIP_RK3399=y CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 @@ -24,7 +26,7 @@ CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/include/configs/roc-pc-rk3399.h b/include/configs/roc-pc-rk3399.h index d4cbc3532e..59fe22289c 100644 --- a/include/configs/roc-pc-rk3399.h +++ b/include/configs/roc-pc-rk3399.h @@ -13,10 +13,6 @@ #include -#if defined(CONFIG_ENV_IS_IN_MMC) -# define CONFIG_SYS_MMC_ENV_DEV 0 -#endif - #define SDRAM_BANK_SIZE (2UL << 30) #endif From patchwork Mon Jun 8 18:17:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11593787 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CAA61912 for ; Mon, 8 Jun 2020 18:17:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A72692078B for ; Mon, 8 Jun 2020 18:17:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="J7a9/PaK"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="hGa1nFfL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A72692078B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TCXUCEhHySzfXEI+cX7exPca78IbfeUk+0BVmHA2PMI=; b=J7a9/PaKqE1/or LDiQKEvHOFqlIJk+ApgbKYKsGYBUsTfW9idSfBqFtnedcmKgaSbsxQK395p6UCS4PPJxBbVKZux0/ TBXofaHjWjf8WR+PivaB35KmfzVpGiK1c3ZaJ8RAnD7wpR3x33j/arpicoDYkVwysN16O6WfydzK3 Ds2ZjTOQnshKl9faxrEB2BYPZaUDML8sblWlB9zy/OBFyMv0deJMlVweUt9jjccKjfpErLJvPSWin rJhctBYTtOFUUqGAxyXkQlxLEku3eEDLKAbpAtZlUQaczl76vXiYQHsQ8qUDBvT1gX2Zb4JRwdEYA HBkRUF6yLdhspiImrXXw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiML4-0002kR-Bt; Mon, 08 Jun 2020 18:17:38 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiML1-0002iq-JR for linux-rockchip@lists.infradead.org; Mon, 08 Jun 2020 18:17:36 +0000 Received: by mail-pg1-x535.google.com with SMTP id o8so9105010pgm.7 for ; Mon, 08 Jun 2020 11:17:35 -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=Np7xlYBqpRyhamB8FZX9N86LOOp4HKzovA516TU3LJ0=; b=hGa1nFfLCrZDodxZXYo3uPCAiMGaD3jPRVNF3e0WFEGCzt29ceYZXjINpZTON/GXjr FYjTUdh+CuIe6wkXIWM9mWOtkJkA0T7rApz/RpQaNUXhVNqUn7wcqtJ0/OpEjunZRAuW +vAjeJSSTgAnwenwykb6/EM7bCBn8F1vRc79M= 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=Np7xlYBqpRyhamB8FZX9N86LOOp4HKzovA516TU3LJ0=; b=NmL8g6Y3yVC98hJBrLPKONCvmQIsRdZER3MXFiOnqaXdzE1e/AAsEAjGYXCBeczm84 1Ga2EUPkymWI1hAzq/35/Vy0hf68BabCBYxzLycjqPBM1TpHEY0bjQAt26p6qyhwIbB5 N0dvxiy/+mvcljkr/ewykDEEpY/899uZ5A83n12F9qRTIps8J/hOv2J0Bcryc0SAz3oN 8Cvpoo1zcT/cRkP9DnhvQtNI+2/JDLW8eyr8U2pD4migx3dYVAP02DaPBfHrazBIQyjV CQXqY6+fP5WwK2DZmZFYURYyGSP5M7SjB72tcXD457AKHWhlsI2VkNLZykPoxO5HLy/C ylNg== X-Gm-Message-State: AOAM5315MOCx2m5BsotHNJBm/GvSJaQly6XeEeW0xH10/0ebVGiYMnfu a5aJs6jUPrPehUQcImMApy4eiDatAiZcvQ== X-Google-Smtp-Source: ABdhPJwRIWBWRcbBIb5bBzAYM0+/glhkAaAXqbGe31Uy0gekSv4UP7+hpyCeCH5E72yPXTmo95Ps9Q== X-Received: by 2002:a63:d34a:: with SMTP id u10mr20189048pgi.297.1591640254749; Mon, 08 Jun 2020 11:17:34 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9043:af95:b7b4:3ade]) by smtp.gmail.com with ESMTPSA id t7sm180213pju.42.2020.06.08.11.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 11:17:33 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Subject: [PATCH v4 3/4] roc-rk3399-pc: Add SPI boot Date: Mon, 8 Jun 2020 14:17:07 -0400 Message-Id: <20200608181708.17842-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608181708.17842-1-jagan@amarulasolutions.com> References: <20200608181708.17842-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_111735_646433_479FCF8D X-CRM114-Status: UNSURE ( 9.67 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:535 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki , Suniel Mahesh Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org U-Boot TPL 2020.07-rc3-00090-gd4e919f927-dirty (Jun 01 2020 - 23:45:53) Channel 0: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB Channel 1: LPDDR4, 50MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS1 Row=15 CS=2 Die BW=16 Size=2048MB 256B stride 256B stride lpddr4_set_rate: change freq to 400000000 mhz 0, 1 lpddr4_set_rate: change freq to 800000000 mhz 1, 0 Trying to boot from BOOTROM Returning to boot ROM... U-Boot SPL 2020.07-rc3-00087-ga21e9fd385 (Jun 02 2020 - 00:09:45 +0530) Trying to boot from MMC1 NOTICE: BL31: v2.2(release): NOTICE: BL31: Built : 15:05:37, May 12 2020 U-Boot 2020.07-rc3-00087-ga21e9fd385 (Jun 02 2020 - 00:09:45 +0530) SoC: Rockchip rk3399 Reset cause: POR Model: Firefly ROC-RK3399-PC Board DRAM: 3.9 GiB PMIC: RK808 MMC: mmc@fe320000: 1, sdhci@fe330000: 0 Loading Environment from SPI Flash... SF: Detected w25q128 with page size 256 Bytes, erase size 4 KiB, total 16 MiB *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Model: Firefly ROC-RK3399-PC Board Reviewed-by: Kever Yang Signed-off-by: Jagan Teki --- Changes for v4: - none arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 12 +++++++++++- configs/roc-pc-mezzanine-rk3399_defconfig | 3 +++ configs/roc-pc-rk3399_defconfig | 3 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi index 141dd0b306..fc155e6903 100644 --- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi +++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi @@ -12,7 +12,11 @@ }; chosen { - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; + u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdhci, &sdmmc; + }; + + config { + u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */ }; vcc_hub_en: vcc_hub_en-regulator { @@ -40,6 +44,12 @@ vin-supply = <&vcc_vbus_typec0>; }; +&spi1 { + spi_flash: flash@0 { + u-boot,dm-pre-reloc; + }; +}; + &vdd_log { regulator-min-microvolt = <430000>; regulator-init-microvolt = <950000>; diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig index 9c6fd0c98c..03ba519af1 100644 --- a/configs/roc-pc-mezzanine-rk3399_defconfig +++ b/configs/roc-pc-mezzanine-rk3399_defconfig @@ -9,12 +9,15 @@ CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_SPL_SPI_LOAD=y CONFIG_TPL=y CONFIG_TPL_GPIO_SUPPORT=y CONFIG_CMD_BOOTZ=y diff --git a/configs/roc-pc-rk3399_defconfig b/configs/roc-pc-rk3399_defconfig index b225eb38fe..b59b54bd89 100644 --- a/configs/roc-pc-rk3399_defconfig +++ b/configs/roc-pc-rk3399_defconfig @@ -9,12 +9,15 @@ CONFIG_TARGET_ROC_PC_RK3399=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb" CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000 +CONFIG_SPL_SPI_LOAD=y CONFIG_TPL=y CONFIG_TPL_GPIO_SUPPORT=y CONFIG_CMD_BOOTZ=y From patchwork Mon Jun 8 18:17:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11593789 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 37CB0739 for ; Mon, 8 Jun 2020 18:17:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14B0020775 for ; Mon, 8 Jun 2020 18:17:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="oMVqMd7w"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="qKYhoLFy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14B0020775 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=shSgkJgZVF7Ts1e3WemiHQlruKodg9GxHkuyZrWg8Ew=; b=oMVqMd7w7UA8NI Rg529whc99FTy/oaNn+z6V2iVQYQ91rt9QxzAYhZ6HVokNdInPNJJJMd605ax3TFI2lcuyoO9J4HB 3oRimHrPj9S1eJPZAwylLKC/xT4G3s+4XcW42HpcHT6253NmvmTTUVSoc3okaRfMDGCUDXCUvlDby CRazTs+yWqVxo5Pja6eDptQVr/ljuTXHLQqq9XZO/cFADRsKcEh/Xp5UdrJYNE6ETG8OvM6Ni8VA8 Pvdq0gDnKajj2xJ1sO5rjXzk97C9VSVXadx2ZMAAdrhJYIYsnnwh9akRPxbWu8LAl9F/dwVQ3x5y4 B14TYNiFSIZggjLFb/qg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiMLA-0002oN-4g; Mon, 08 Jun 2020 18:17:44 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiML7-0002mf-69 for linux-rockchip@lists.infradead.org; Mon, 08 Jun 2020 18:17:42 +0000 Received: by mail-pl1-x644.google.com with SMTP id x11so6969353plv.9 for ; Mon, 08 Jun 2020 11:17: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=6LipOeR35UNlq6/T17OBC7BQS9hPC5+ORvdL4ZZQyaY=; b=qKYhoLFyT/K2RM2w4wDSHkWpSOnIBzgRmtYfk9jX+qPIXTBjbLPm/rEQWzw4PyRejG dTEKzvurJDANqVTC4nlVMXW50jZs+OOpM//ERy8oFng9Wihj2lOzbb4uFAc6MzUN8pSN 9QbStnu4jeYRCLVx1nvA5cPB8pQowa8VaI2sg= 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=6LipOeR35UNlq6/T17OBC7BQS9hPC5+ORvdL4ZZQyaY=; b=by+1eIPLOKc6nqbF1zRaj+/q/nj3fCRoFzEr8J75J12/dpM6p1jTeJEFNrObOSyOPB bve3fFu0g88gZfXBlqdT+NrZuwkVOtR4EeBR504777YSi/wgwTzxe+C5hLEoUK+krosd Q8IGDy29w5wqtlk+kkzcXvs1xosU3Oq/ehkJoVoKG1jfd0rV1H2Qo6fm7O5qnvSXIak7 VuIGcaiNGCg93mcAornW5nP6FZt0ahO7Z984BAsxYLxt13e5qmDGRmloySK0KK2h3rGO EZZ1YytMnB8xzjvDzvyFWbE69lOZDKfHxC5yFrbBDMjwB+FxD1Z4qge35IM1FmnbeTAk kQlg== X-Gm-Message-State: AOAM533FATsRXNVCwxUtNpVH9Exn7Qt39Qs/yTvYbE5NTIzNP5ANcYuZ 6/FGsFtBTTbS4+OOqPVYNjlVFA== X-Google-Smtp-Source: ABdhPJyJjvQIqZhDx5ie+WHtNa+bt0dcy618wgBWVtPGZK5/KQrLUdLRp5NYu6z7o17dxAFBnVUHlQ== X-Received: by 2002:a17:90a:9292:: with SMTP id n18mr537029pjo.3.1591640260445; Mon, 08 Jun 2020 11:17:40 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9043:af95:b7b4:3ade]) by smtp.gmail.com with ESMTPSA id t7sm180213pju.42.2020.06.08.11.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 11:17:39 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Subject: [PATCH v4 4/4] doc: rockchip: Document SPI flash program steps Date: Mon, 8 Jun 2020 14:17:08 -0400 Message-Id: <20200608181708.17842-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608181708.17842-1-jagan@amarulasolutions.com> References: <20200608181708.17842-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_111741_227693_1A134C8B X-CRM114-Status: UNSURE ( 7.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:644 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, Hugh Cole-Baker , U-Boot-Denx , Jagan Teki , Suniel Mahesh , linux-amarula Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Document SPI flash program steps for rockchip platforms. Suggested-by: Hugh Cole-Baker Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v4: - none doc/board/rockchip/rockchip.rst | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst index 7b72fab496..76b228a046 100644 --- a/doc/board/rockchip/rockchip.rst +++ b/doc/board/rockchip/rockchip.rst @@ -162,6 +162,30 @@ Program the flash:: Note: for rockchip 32-bit platforms the U-Boot proper image is u-boot-dtb.img +SPI +^^^ + +Generating idbloader for SPI boot would require to input a multi image +image format to mkimage tool instead of concerting (like for MMC boot). + +SPL-alone SPI boot image:: + + ./tools/mkimage -n rk3399 -T rkspi -d spl/u-boot-spl.bin idbloader.img + +TPL+SPL SPI boot image:: + + ./tools/mkimage -n rk3399 -T rkspi -d tpl/u-boot-tpl.bin:spl/u-boot-spl.bin idbloader.img + +Copy SPI boot images into SD card and boot from SD:: + + sf probe + load mmc 1:1 $kernel_addr_r idbloader.img + sf erase 0 +$filesize + sf write $kernel_addr_r 0 ${filesize} + load mmc 1:1 ${kernel_addr_r} u-boot.itb + sf erase 0x60000 +$filesize + sf write $kernel_addr_r 0x60000 ${filesize} + TODO ---- @@ -171,4 +195,4 @@ TODO - Add missing SoC's with it boards list .. Jagan Teki -.. Sunday 24 May 2020 10:08:41 PM IST +.. Tuesday 02 June 2020 12:18:57 AM IST