From patchwork Tue Apr 2 12:41:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074361 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P1qxKdOz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTP82BLsz9sN8 for ; Tue, 2 Apr 2019 23:42:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D475BC21DA2; Tue, 2 Apr 2019 12:42:01 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D67DEC21EE0; Tue, 2 Apr 2019 12:41:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91571C21EE0; Tue, 2 Apr 2019 12:41:49 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id B95D0C21E26 for ; Tue, 2 Apr 2019 12:41:44 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id k3so6519229pga.6 for ; Tue, 02 Apr 2019 05:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X2QVfL7NgF9Qf2+Wb164JgEnpv2OY6XBBzaU74JkPno=; b=P1qxKdOztgHvUpTjcKZO/2XxGxVag0HrauKUwPFEsXdXbAq8rBzk+8wtukYAmmU/E4 +hOF/FMoawiTLZa/MRgNbSUrmHHMcWw0YmxloSeDx1W0vO+Svh90qQTm2CiHz5s4ozO4 /pHbBbmQuOe6c5zEUZegF4Zxq0/lsWAKrGviBkss3p67D+mQnkuHSMmpy3cvtU+PVaQv /5WX3hJTjxwA4yLQ4LlK/W0KXhGPw6kqdVn4Ijwv/Nc5xejvnrCybxRE6EM8fMj43pD0 428fW7PsWanNnncTEX2GpVT7rHrpjYYa++x+Rto19Iuqb2kHsYzJ8a7GFNz8lPz4nNiQ WyYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=X2QVfL7NgF9Qf2+Wb164JgEnpv2OY6XBBzaU74JkPno=; b=IblTOqEE4gEJ1pWe0CQe7W0Hpa9/SMowv4lXbbIYzXWVxKxRXN78spdtYYWKMdlctK dqelTDDU3BI+aZmJ9/0JRt7kl6ggSd4wF91aS2hcg1byO2s3Waj2wP68dgYeA1Hea7aJ 6Q11x46ovv+Myt8EbopB0BI1EVc+F4eETn6xAwNeAafvVcheIdIspHt+CpA57x0iMsbH TcpGXZNffb0RP4HJb44RVx+/Occ7QVMhcdB1UNTvl+wOK0+oGHI2wSDt3JUqFRiu65VL qinxWnm5W8AiRqGkYaOhyhMa12r711WXk9LVV5kL6jx/uD7adZyZqJCYtaExcb5WD5Je Hsag== X-Gm-Message-State: APjAAAXk00k9TBFgEXfmCoSQTxaxpLTMaXOKz1x1q9hyaCJDtoAZ8ve3 gBNk6CSW/njdN63WzVfgDSHdUwes X-Google-Smtp-Source: APXvYqxoiEKQP+VBsAUQznIKkITMc6JZ82+GKFJWVC8gq7BgC51JqDGN4FQHyknNjhj5pi6yBZRfKA== X-Received: by 2002:a63:c64a:: with SMTP id x10mr36253434pgg.12.1554208902772; Tue, 02 Apr 2019 05:41:42 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:41 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:19 +0800 Message-Id: <20190402124129.7870-2-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 01/11] Revert "rockchip: rk322x: ram: enable DRAM init in SPL instead of TPL" 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" This reverts commit f338cca1d2bce906b049722d2fdbf527a4963b61. Signed-off-by: Kever Yang --- Changes in v6: None drivers/ram/rockchip/sdram_rk322x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/ram/rockchip/sdram_rk322x.c b/drivers/ram/rockchip/sdram_rk322x.c index c596523d4f..e96ac54c39 100644 --- a/drivers/ram/rockchip/sdram_rk322x.c +++ b/drivers/ram/rockchip/sdram_rk322x.c @@ -49,7 +49,7 @@ struct rk322x_sdram_params { struct regmap *map; }; -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD /* * [7:6] bank(n:n bit bank) * [5:4] row(13+n) @@ -750,7 +750,7 @@ static int rk322x_dmc_ofdata_to_platdata(struct udevice *dev) return 0; } -#endif /* CONFIG_SPL_BUILD */ +#endif /* CONFIG_TPL_BUILD */ #if CONFIG_IS_ENABLED(OF_PLATDATA) static int conv_of_platdata(struct udevice *dev) @@ -778,7 +778,7 @@ static int conv_of_platdata(struct udevice *dev) static int rk322x_dmc_probe(struct udevice *dev) { -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD struct rk322x_sdram_params *plat = dev_get_platdata(dev); int ret; struct udevice *dev_clk; @@ -786,7 +786,7 @@ static int rk322x_dmc_probe(struct udevice *dev) struct dram_info *priv = dev_get_priv(dev); priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD #if CONFIG_IS_ENABLED(OF_PLATDATA) ret = conv_of_platdata(dev); if (ret) @@ -842,12 +842,12 @@ U_BOOT_DRIVER(dmc_rk322x) = { .id = UCLASS_RAM, .of_match = rk322x_dmc_ids, .ops = &rk322x_dmc_ops, -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD .ofdata_to_platdata = rk322x_dmc_ofdata_to_platdata, #endif .probe = rk322x_dmc_probe, .priv_auto_alloc_size = sizeof(struct dram_info), -#ifdef CONFIG_SPL_BUILD +#ifdef CONFIG_TPL_BUILD .platdata_auto_alloc_size = sizeof(struct rk322x_sdram_params), #endif }; From patchwork Tue Apr 2 12:41:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074367 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aPZ+ajtg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTRL0T6tz9sRk for ; Tue, 2 Apr 2019 23:43:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A9040C21EB9; Tue, 2 Apr 2019 12:42:27 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D5202C21ED6; Tue, 2 Apr 2019 12:41:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8C2C9C21EB9; Tue, 2 Apr 2019 12:41:51 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by lists.denx.de (Postfix) with ESMTPS id 025B2C21EA6 for ; Tue, 2 Apr 2019 12:41:47 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id b3so3240249plr.7 for ; Tue, 02 Apr 2019 05:41:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZK55L6Mra7RdJYfnJnfRGmhCAiVRoywjt+idsnGIyTk=; b=aPZ+ajtgVvSakUzxcC3iFeqyxcMobNGPsGPCnl/PYiE7THON1eEtLSEgohdX5joSZD 6syBYIwTrKcc8iJ8M0CClDpXhNADUMuZu2mHoOJbIo39pomgswWrCNGxmVyO4cAv/fJ/ JlQ2xlIPGKZCSgEyH2OALYcEZYr4AAb0QO3wXUEp4kNnx8VeCwiWnFHp48U9fLaoGqJ5 BGSHKJBocw7Uu7/ZVAz/5AEkzqxOMcMiLGMmoe20mg2xCxaf/KE0aLALmZYiCOu48J3i SUyzHrVy6f50nrtihJmLeziko8eFSbwXvWUUeCwk2yHSUmEazVbfNY7aHb4DhucKjq+8 tFUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZK55L6Mra7RdJYfnJnfRGmhCAiVRoywjt+idsnGIyTk=; b=IdIOVBdcyeuUHRuiXmbpT2Oiiw9tXqT5hPtrZYvXDhPoDI6WXbRyD11UbBuJM65vUn r3+2w+FdiMyXLiByUUiC5glILWNI33iDkcL1yI0U86HQaJHgd1Khviu/hgBtmbb90gkX XJgyPGDZ4n6w3YejvLLqUaI0PePjzc/Q2xBTavDs+QonLsVJAuoavvcDcG8B7SVoqwDU Y0F7ZE7WTzR39PJBy2H9n7p+c5A62s40E1BZNxN1aYgDmnLDSNhe7JUDdFaEEZGuKy3F CC5FPSJw5S8RnWs9UGhnfCNKUXH+rVBMJn85zfx8vudoNm/GTKel+m55EMCxWeM0dElc Y3gQ== X-Gm-Message-State: APjAAAU7QdVoXNA9W93iMTCmcPQG/PPsc1ufJYNIL4+khW3VGNMrNERj 8NADO7oiv1fvAX8PXrN19xX1KOhz X-Google-Smtp-Source: APXvYqw14CNoan13gs42kf7aFqerTI2vYZSvV5D+6ROC+2/BgVB36evFRy9/EcQrXJpFjB+1feDy6A== X-Received: by 2002:a17:902:22f:: with SMTP id 44mr70905891plc.138.1554208905293; Tue, 02 Apr 2019 05:41:45 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:44 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:20 +0800 Message-Id: <20190402124129.7870-3-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v6 02/11] arm: add option for TPL support in arm 32bit 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" Some options like TPL_SYS_THUMB_BUILD, TPL_USE_ARCH_MEMCPY and TPL_USE_ARCH_MEMCPY are needed for TPL build in 32bit arm. Signed-off-by: Kever Yang --- Changes in v6: None arch/arm/Kconfig | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a5851aeeae..18e8d9355c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -338,6 +338,17 @@ config SPL_SYS_THUMB_BUILD density. For ARM architectures that support Thumb2 this flag will result in Thumb2 code generated by GCC. +config TPL_SYS_THUMB_BUILD + bool "Build TPL using the Thumb instruction set" + default y if SYS_THUMB_BUILD + depends on TPL && !ARM64 + help + Use this flag to build SPL using the Thumb instruction set for + ARM architectures. Thumb instruction set provides better code + density. For ARM architectures that support Thumb2 this flag will + result in Thumb2 code generated by GCC. + + config SYS_L2CACHE_OFF bool "L2cache off" help @@ -373,6 +384,15 @@ config SPL_USE_ARCH_MEMCPY Such implementation may be faster under some conditions but may increase the binary size. +config TPL_USE_ARCH_MEMCPY + bool "Use an assembly optimized implementation of memcpy for TPL" + default y if USE_ARCH_MEMCPY + depends on !ARM64 + help + Enable the generation of an optimized version of memcpy. + Such implementation may be faster under some conditions + but may increase the binary size. + config USE_ARCH_MEMSET bool "Use an assembly optimized implementation of memset" default y @@ -391,6 +411,15 @@ config SPL_USE_ARCH_MEMSET Such implementation may be faster under some conditions but may increase the binary size. +config TPL_USE_ARCH_MEMSET + bool "Use an assembly optimized implementation of memset for TPL" + default y if USE_ARCH_MEMSET + depends on !ARM64 + help + Enable the generation of an optimized version of memset. + Such implementation may be faster under some conditions + but may increase the binary size. + config ARM64_SUPPORT_AARCH32 bool "ARM64 system support AArch32 execution state" default y if ARM64 && !TARGET_THUNDERX_88XX From patchwork Tue Apr 2 12:41:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074366 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="crbTW3Qg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTQ32Jfcz9sP7 for ; Tue, 2 Apr 2019 23:42:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 78F7CC21E1A; Tue, 2 Apr 2019 12:42:14 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6B5ACC21EB9; Tue, 2 Apr 2019 12:41:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EE60FC21EF2; Tue, 2 Apr 2019 12:41:53 +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 D9228C21EE7 for ; Tue, 2 Apr 2019 12:41:49 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id w23so3276777ply.4 for ; Tue, 02 Apr 2019 05:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dt11WlfP3LkrnPOtXbS2x5+ezymiyuFLilusrxa2kBo=; b=crbTW3Qgru+ZqHi/1sTEhUqOyhphctWQlsvhbYxoI3fKddk0q8L7qonvmFScZpA0vE UsMh1dpvECQo1aH2PfO7yM7j+Sn7c6pOrIBsLNvcOBHY2lHhfK+aPpO7qH7hxmQGFNVv 2YHSKGyMoQIW402BCPzydOeYPSvnT+i1Fr2ukf0jIyDCAWH8NNfo7uidTTlO9pguy6wd sAJs88QbtODjW2c4hx0OW6g8aXQeW2u0Sba8VlTw6j/ELv6JRvO4MwkUzMA/a8rNqeQG 5jY+JXwY+4DctP5gMmx06zNXFeoUJPEzlb8IyuDQinOo2V97J0XC8gsyo/9tq7c212Je Owyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Dt11WlfP3LkrnPOtXbS2x5+ezymiyuFLilusrxa2kBo=; b=FUbfrskU4HnE5S9KTWJkFv+k96CP49d0orh6Ojbe0z/Bg6QNpbylH+uNY/Q07WoeI6 1WktiA1I0pgMmJuW41wGGyT6raONlrORLJiWSPwCGtPm5l2njIgToVHO7vF3SUP8iLHA QkDWWzx2Tmg+3r64JhwRJLFn6+EcZSGgiVikzeg6Dwape7PwKo5K3eVB4GTcfKbNSAPF amMfgh/f0qs7DN0BAdA0+dsAwMKG+RBd8kTKb9h8WcJ1UrTy2/Jxl42s96ilVLUaR88z E9f7QfCQjBDGwD4rY+e17cPw63tXUqTMVY8s9nCOyCsew6LVr2IWgDXBzWMxKYmfX2T3 Sf+Q== X-Gm-Message-State: APjAAAXrjuF9NDR/IrnKJvFs/Zb8CEWr0vCV7+Myqy8BiWPS1hF4cqb2 NAYY9FmWRluZOPp1K9eCd3ADHvzs X-Google-Smtp-Source: APXvYqyfNmkmPn0ByTI8SSeO8ifwhGODK3Imm+Skfff7Z079rpUJr2I8iO/gw1UlYmNGC4jXCKgN5A== X-Received: by 2002:a17:902:26f:: with SMTP id 102mr5256233plc.175.1554208908237; Tue, 02 Apr 2019 05:41:48 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:47 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:21 +0800 Message-Id: <20190402124129.7870-4-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH v6 03/11] arm: add a separate stack for TPL 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" TPL stack may different from SPL and sys stack, add support for separate one when the board defines it. Signed-off-by: Kever Yang --- Changes in v6: None arch/arm/lib/crt0.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index fe312db690..30fba20e1b 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -67,7 +67,9 @@ ENTRY(_main) * Set up initial C runtime environment and call board_init_f(0). */ -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) +#if defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_NEEDS_SEPARATE_STACK) + ldr r0, =(CONFIG_TPL_STACK) +#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) ldr r0, =(CONFIG_SPL_STACK) #else ldr r0, =(CONFIG_SYS_INIT_SP_ADDR) From patchwork Tue Apr 2 12:41:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074371 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vG1g9lS4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTV21NfGz9sRk for ; Tue, 2 Apr 2019 23:46:18 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B9DE1C21E8A; Tue, 2 Apr 2019 12:42:41 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 5A0B2C21ECA; Tue, 2 Apr 2019 12:42:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C5E30C21EB4; Tue, 2 Apr 2019 12:41:55 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id 178E4C21EC3 for ; Tue, 2 Apr 2019 12:41:52 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id q1so6504468pgv.13 for ; Tue, 02 Apr 2019 05:41:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oJRbLwzwKHJB62Se0DBSE1fMu2yMiKcSG7TWfEU7YK4=; b=vG1g9lS4I/ZqLW0W9XXAEOdL6/LZkqwOsA7XUyknLfGDrDxKUJlP1bi1XgonHfsQPx 8R/PuoQO4GEgOkVDEkLrf16wOPi/Q2Pvp9TBWlJo9cWJ3CouAV2qNj9P+LvGKvxpCsGl kl39zbVmBqqQl66cZfs6poj6dBXozoXx60+YF9LjBKoeeu0ft3bKdRK4znZVOmDhg7+d rkzl14K9L9xL7djViNqhRCtNAvy+iBlpeTg3NUXnu/aAmnfcFck1lKJNj/RifjkrEK6s QKmxqMzKnPn5HW+rrpJpuob/AVSV4rxU3mBbXc3PmponpyUFJGCC0BYJDvLOBbZlDQgo lBYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oJRbLwzwKHJB62Se0DBSE1fMu2yMiKcSG7TWfEU7YK4=; b=sTDxg/+iufL6eYaqjikhNiDsPjG40w1nUdEZZRqZ5Fc/YlswfFXGjcqhOqlfqDRT6T UazOd65X8BUmpmfkLfgpZK5Ma9+bsydURDXih8eOkXcgH3LgXi85h2z7TsfmRqMp3bvX ZgQMt+6/G5ha+A6ByuHv2q82TO5+vsBLbbVIA73qQkArWtHbHWytup7dPFmssO6/kF21 Pb39qIEo+XGAUZuL9R0QLbA4xH2TSNjxgB6GM7ftu+YQZJmK73YID1TPCMDOippHPA/o ykiJ7udmTx3bJGnEbxmvCHxQmANfsFqwE8/xpdIV8XU4NaU3k1nYTHVe4bW7CD2OIgYb JSKA== X-Gm-Message-State: APjAAAV2yASHxVvN/uWkLKtglyuT3seuLmyX79pvcJ/Pgko4qtxKkSOt c665FCzgEP+X/FCqIl/SCSwmn4qy X-Google-Smtp-Source: APXvYqxqbsg0Eokw4ILcWLdxA+GPsWVTnPMOJvVZ93unlVNGgifhgESzKyrqT1lv4G3WZtLbTyD+oQ== X-Received: by 2002:a63:4a5a:: with SMTP id j26mr56769408pgl.361.1554208910371; Tue, 02 Apr 2019 05:41:50 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:49 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:22 +0800 Message-Id: <20190402124129.7870-5-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 04/11] rockchip: rk322x: add CLK_EMMC_SAMPLE clock support 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" Signed-off-by: Kever Yang --- Changes in v6: None drivers/clk/rockchip/clk_rk322x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index 48ed14b2af..4b599fbb24 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -217,6 +217,7 @@ static ulong rockchip_mmc_get_clk(struct rk322x_cru *cru, uint clk_general_rate, switch (periph) { case HCLK_EMMC: case SCLK_EMMC: + case SCLK_EMMC_SAMPLE: con = readl(&cru->cru_clksel_con[11]); mux = (con & EMMC_PLL_MASK) >> EMMC_PLL_SHIFT; con = readl(&cru->cru_clksel_con[12]); @@ -293,6 +294,7 @@ static ulong rockchip_mmc_set_clk(struct rk322x_cru *cru, uint clk_general_rate, switch (periph) { case HCLK_EMMC: case SCLK_EMMC: + case SCLK_EMMC_SAMPLE: rk_clrsetreg(&cru->cru_clksel_con[11], EMMC_PLL_MASK, mux << EMMC_PLL_SHIFT); From patchwork Tue Apr 2 12:41:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074369 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FLYNBAoO"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTSb1VDcz9sP7 for ; Tue, 2 Apr 2019 23:45:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 88E07C21ECE; Tue, 2 Apr 2019 12:43:12 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 43F4EC21DA2; Tue, 2 Apr 2019 12:42:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B8A58C21EA2; Tue, 2 Apr 2019 12:41:58 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by lists.denx.de (Postfix) with ESMTPS id 2FEE9C21EC8 for ; Tue, 2 Apr 2019 12:41:54 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id i19so6335354pfd.0 for ; Tue, 02 Apr 2019 05:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NHoulSI12JhUqy3vJ+3iO3XQwKrB6zeQ3Gconme0sUg=; b=FLYNBAoOAU2aOJpZPBnSE0rhfZWdy22ED4p8dTveMk/AgrlKvdCZgSR5ET6OMEGOKg vzaBMqVQ77stMCVetYqfEzE5NwmthC8X+GCR0fOcO77Bv4sOnSJ+6a59FsQ2Pm925Zdi wn25ungzVx0LdNOVGgfB8q8q4LYX5MyIvgBHVGS6AQvGA1DRYOLbMc0YJGF2xXEqIyLY iEP/indNnKmoH/ps+txozis0+Hlzh3DhWazqMQW0336wQa/arxfgy9Wt9GYAovmyr1t2 c9GQ/oUbrKgNflUGGj9NFLk/neiHu6xl3hrDsS2IoY+MGVkNFSMXFy0Qs0JMHnm7IPkm dZ3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NHoulSI12JhUqy3vJ+3iO3XQwKrB6zeQ3Gconme0sUg=; b=KGeLhDuXJn+8tCBWtmQqUvAmc+sGsyJn0F10LemmJ240f+SNkQH+Oh/Tg/0wIbZd6i P5BrkgjUAirWgz8nf/NkCfSW9RjNxQ7DIzOMUXsoLn4yeMZ/SO2Dq5/jn5ohz1ns7LL3 jRFu9K8QIXZR4jcnP9oUBgY/bhb0rXz8uuvJeY1npenKEVGr3wujKkxnoiyceiXH2TRw yDUluVschupnAJXfuhbeBjhCBhKUUfpleiKu09d2W35O7KAuGFU5vPxi9VtdUyfV3vGa ZRDSMKQMSay+ORbuwwvmCyxLCDPlTdnTefLxw/71+eZ6stIaaJIa6IxebNrTQ3p0CPw2 26yw== X-Gm-Message-State: APjAAAW8fJZP6W/Z9MUGjeWpWvgHHq9p9AUZrwV6ClBX+SwL/dhOhYhP 1Wf12JblVfCupH2jy/CYO1CErjZh X-Google-Smtp-Source: APXvYqw/UdhNR19bBCgSD/OGE+vlm0OWxotYTYD2TOKVb/XQh1Kl8oyrgKv8xnqLeZbBJIYqfW93cQ== X-Received: by 2002:a63:707:: with SMTP id 7mr44691468pgh.390.1554208912465; Tue, 02 Apr 2019 05:41:52 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:51 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:23 +0800 Message-Id: <20190402124129.7870-6-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 05/11] rockchip: clk: rk322x: fix assert clock value 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" BUS_PCLK_HZ and BUS_HCLK_HZ are from BUS_ACLK_HZ, not from GPLL_HZ. Signed-off-by: Kever Yang --- Changes in v6: None drivers/clk/rockchip/clk_rk322x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c index 4b599fbb24..f09730c91b 100644 --- a/drivers/clk/rockchip/clk_rk322x.c +++ b/drivers/clk/rockchip/clk_rk322x.c @@ -121,10 +121,10 @@ static void rkclk_init(struct rk322x_cru *cru) assert((aclk_div + 1) * BUS_ACLK_HZ == GPLL_HZ && aclk_div <= 0x1f); pclk_div = BUS_ACLK_HZ / BUS_PCLK_HZ - 1; - assert((pclk_div + 1) * BUS_PCLK_HZ == GPLL_HZ && pclk_div <= 0x7); + assert((pclk_div + 1) * BUS_PCLK_HZ == BUS_ACLK_HZ && pclk_div <= 0x7); hclk_div = BUS_ACLK_HZ / BUS_HCLK_HZ - 1; - assert((hclk_div + 1) * BUS_HCLK_HZ == GPLL_HZ && hclk_div <= 0x3); + assert((hclk_div + 1) * BUS_HCLK_HZ == BUS_ACLK_HZ && hclk_div <= 0x3); rk_clrsetreg(&cru->cru_clksel_con[0], BUS_ACLK_PLL_SEL_MASK | BUS_ACLK_DIV_MASK, From patchwork Tue Apr 2 12:41:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074368 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NhFU3tY5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTS05FD0z9sP7 for ; Tue, 2 Apr 2019 23:44:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 36AB6C21EBD; Tue, 2 Apr 2019 12:42:56 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3591DC21E70; Tue, 2 Apr 2019 12:42:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5F1BEC21E70; Tue, 2 Apr 2019 12:42:00 +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 302D2C21E88 for ; Tue, 2 Apr 2019 12:41:57 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id y6so6213655pll.13 for ; Tue, 02 Apr 2019 05:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QO9eVznXCex+eMikYRfV0gg2wzVMB5ed1iGUofk+lS8=; b=NhFU3tY5OByuzJjwu5ABY1EaOobLqtYkb6/vkwCPSStWlximklMhdJ9oAs9C08wdDs yFFJJANK+A4YFe+dtfu4T+07JKih4hGbhIFwlFktWY4uATm4hpgDQcuLRV92tudMR2SN Rgyq4p1az1+tldNLPknuRxQEzKSmSnpYbE20JtksVlmAI7REAUMF3UObgNWc3WwgfqvB rvbhS/euSE8ivUPIsfXjY9riGPvV7KtWKVlKodnFlsPummAVc9vXLMP50aGvwJniNdNh ++d67ydOOI0d+vGYisapkF1MG/V+wvmClOBjoILZ6dIJHiuym/BM60FObbcLvwnKMvd0 qlrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QO9eVznXCex+eMikYRfV0gg2wzVMB5ed1iGUofk+lS8=; b=UA6R/vBGDKHury+mfQrcF4o0LolHRVoW/rhc4TTKimiRCcntkRNBs5/8MgxCz6yG6M yu4v70An5SN/4DDLPM7/s81OQZ0gzAhayQPhFd9LohcBtpM77hjNulEXyKrSySd6KI/x MVU43Aqds69J+03YvZufz0oVAB0kldCLEElRUA5d0ZfxrBVnJ4b17CeRYEbNzSWlcY6w hL+5knJrVcNtXSQDw43FOL/9XAV4nl1k+DmSBhM1rW40RNoRhrLPRPY6HIWuSKQLgoC/ RerVHQVSLBHKUPJXHbaA9YtHkO3Ukhwi7fPRYeCzyniVmMF+juergq/8I4GNJqrXqlbu 6uuw== X-Gm-Message-State: APjAAAX4y44A0lHzDLjoRMGOGNEcgHV7xu8AJtVXVIIGsLoSiSn4KqfC V6/o/ADNmnbDNfpmvDdIs83LULju X-Google-Smtp-Source: APXvYqywQ8SXA3YuK46dlndzeC7wrMtS2ruawhkGI8Lz1YDMj67oqGDyuBQuF3wdR+aWmqQyRMzhag== X-Received: by 2002:a17:902:d68d:: with SMTP id v13mr56484244ply.55.1554208915360; Tue, 02 Apr 2019 05:41:55 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:54 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:24 +0800 Message-Id: <20190402124129.7870-7-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: Otavio Salvador Subject: [U-Boot] [PATCH v6 06/11] rockchip: rk322x: add tpl support 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" Move original spl to tpl, and add spl to load next stage firmware, adapt all the address and option for them. Signed-off-by: Kever Yang --- Changes in v6: None arch/arm/mach-rockchip/Kconfig | 26 +++++++++++ arch/arm/mach-rockchip/Makefile | 3 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 46 ++++++++------------ arch/arm/mach-rockchip/rk322x-board-tpl.c | 53 +++++++++++++++++++++++ arch/arm/mach-rockchip/u-boot-tpl.lds | 12 +++++ include/configs/rk322x_common.h | 10 +++-- 6 files changed, 116 insertions(+), 34 deletions(-) create mode 100644 arch/arm/mach-rockchip/rk322x-board-tpl.c create mode 100644 arch/arm/mach-rockchip/u-boot-tpl.lds diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 17b3b9372d..d0ed369f55 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -47,14 +47,40 @@ config ROCKCHIP_RK322X bool "Support Rockchip RK3228/RK3229" select CPU_V7A select SUPPORT_SPL + select SUPPORT_TPL select SPL + select SPL_DM + select SPL_OF_LIBFDT + select TPL + select TPL_DM + select TPL_OF_LIBFDT + select TPL_NEEDS_SEPARATE_TEXT_BASE if SPL + select TPL_NEEDS_SEPARATE_STACK if TPL + select SPL_DRIVERS_MISC_SUPPORT + imply SPL_SERIAL_SUPPORT + imply TPL_SERIAL_SUPPORT select ROCKCHIP_BROM_HELPER + select TPL_LIBCOMMON_SUPPORT + select TPL_LIBGENERIC_SUPPORT help The Rockchip RK3229 is a ARM-based SoC with a dual-core Cortex-A7 including NEON and GPU, Mali-400 graphics, several DDR3 options and video codec support. Peripherals include Gigabit Ethernet, USB2 host and OTG, SDIO, I2S, UART, SPI, I2C and PWMs. +if ROCKCHIP_RK322X + +config TPL_TEXT_BASE + default 0x10081000 + +config TPL_MAX_SIZE + default 28672 + +config TPL_STACK + default 0x10088000 + +endif + config ROCKCHIP_RK3288 bool "Support Rockchip RK3288" select CPU_V7A diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index 368302e1da..fd62a693fe 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -11,10 +11,11 @@ obj-tpl-$(CONFIG_ROCKCHIP_BROM_HELPER) += bootrom.o obj-tpl-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-tpl.o obj-tpl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-tpl.o +obj-tpl-$(CONFIG_ROCKCHIP_RK322X) += rk322x-board-tpl.o obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o obj-spl-$(CONFIG_ROCKCHIP_RK3188) += rk3188-board-spl.o -obj-spl-$(CONFIG_ROCKCHIP_RK322X) += rk322x-board-spl.o +obj-spl-$(CONFIG_ROCKCHIP_RK322X) += rk322x-board-spl.o spl-boot-order.o obj-spl-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o obj-spl-$(CONFIG_ROCKCHIP_RK3368) += rk3368-board-spl.o spl-boot-order.o obj-spl-$(CONFIG_ROCKCHIP_RK3399) += rk3399-board-spl.o spl-boot-order.o diff --git a/arch/arm/mach-rockchip/rk322x-board-spl.c b/arch/arm/mach-rockchip/rk322x-board-spl.c index 888310efbe..c9b41c62c0 100644 --- a/arch/arm/mach-rockchip/rk322x-board-spl.c +++ b/arch/arm/mach-rockchip/rk322x-board-spl.c @@ -4,55 +4,43 @@ */ #include -#include #include -#include #include #include -#include #include -#include u32 spl_boot_device(void) { return BOOT_DEVICE_MMC1; } +u32 spl_boot_mode(const u32 boot_device) +{ + return MMCSD_MODE_RAW; +} + #define SGRF_DDR_CON0 0x10150000 void board_init_f(ulong dummy) { - struct udevice *dev; int ret; -#ifdef CONFIG_DEBUG_UART - /* - * Debug UART can be used from here if required: - * - * debug_uart_init(); - * printch('a'); - * printhex8(0x1234); - * printascii("string"); - */ - debug_uart_init(); - printascii("SPL Init"); -#endif ret = spl_early_init(); if (ret) { - debug("spl_early_init() failed: %d\n", ret); + printf("spl_early_init() failed: %d\n", ret); hang(); } - - rockchip_timer_init(); - printf("timer init done\n"); - ret = uclass_get_device(UCLASS_RAM, 0, &dev); - if (ret) { - printf("DRAM init failed: %d\n", ret); - return; - } + preloader_console_init(); /* Disable the ddr secure region setting to make it non-secure */ rk_clrreg(SGRF_DDR_CON0, 0x4000); -#if defined(CONFIG_SPL_ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) - back_to_bootrom(BROM_BOOT_NEXTSTAGE); -#endif } + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + /* Just empty function now - can't decide what to choose */ + debug("%s: %s\n", __func__, name); + + return 0; +} +#endif diff --git a/arch/arm/mach-rockchip/rk322x-board-tpl.c b/arch/arm/mach-rockchip/rk322x-board-tpl.c new file mode 100644 index 0000000000..92d40ee43a --- /dev/null +++ b/arch/arm/mach-rockchip/rk322x-board-tpl.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2019 Rockchip Electronics Co., Ltd + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +u32 spl_boot_device(void) +{ + return BOOT_DEVICE_MMC1; +} + +void board_init_f(ulong dummy) +{ + struct udevice *dev; + int ret; + + /* + * Debug UART can be used from here if required: + * + * debug_uart_init(); + * printch('a'); + * printhex8(0x1234); + * printascii("string"); + */ + debug_uart_init(); + printascii("TPL Init"); + + ret = spl_early_init(); + if (ret) { + debug("spl_early_init() failed: %d\n", ret); + hang(); + } + + rockchip_timer_init(); + printf("timer init done\n"); + ret = uclass_get_device(UCLASS_RAM, 0, &dev); + if (ret) { + printf("DRAM init failed: %d\n", ret); + return; + } + +#if defined(CONFIG_TPL_ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_TPL_BOARD_INIT) + back_to_bootrom(BROM_BOOT_NEXTSTAGE); +#endif +} diff --git a/arch/arm/mach-rockchip/u-boot-tpl.lds b/arch/arm/mach-rockchip/u-boot-tpl.lds new file mode 100644 index 0000000000..f5a89721ce --- /dev/null +++ b/arch/arm/mach-rockchip/u-boot-tpl.lds @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Rockchip Electronic Co.,Ltd + */ + +#undef CONFIG_SPL_TEXT_BASE +#define CONFIG_SPL_TEXT_BASE CONFIG_TPL_TEXT_BASE + +#undef CONFIG_SPL_MAX_SIZE +#define CONFIG_SPL_MAX_SIZE CONFIG_TPL_MAX_SIZE + +#include "../cpu/u-boot-spl.lds" diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index 9e1ff17f48..cb4dc42122 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -17,10 +17,12 @@ #define CONFIG_SYS_TIMER_BASE 0x110c00a0 /* TIMER5 */ #define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) -#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_SYS_LOAD_ADDR 0x60800800 -#define CONFIG_SPL_STACK 0x10088000 -#define CONFIG_SPL_TEXT_BASE 0x10081000 +#define CONFIG_SYS_NS16550_MEM32 +#define CONFIG_SYS_INIT_SP_ADDR 0x61100000 +#define CONFIG_SYS_LOAD_ADDR 0x61800800 +#define CONFIG_SPL_STACK 0x60088000 +#define CONFIG_SPL_TEXT_BASE 0x60000000 +#define CONFIG_SPL_MAX_SIZE 0x100000 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (28 << 10) #define CONFIG_ROCKCHIP_CHIP_TAG "RK32" From patchwork Tue Apr 2 12:41:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074376 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lholVV5Y"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTWV04f5z9sP7 for ; Tue, 2 Apr 2019 23:47:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9ABDDC21E44; Tue, 2 Apr 2019 12:43:38 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 86D01C21EE7; Tue, 2 Apr 2019 12:42:29 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F120AC21EC5; Tue, 2 Apr 2019 12:42:04 +0000 (UTC) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by lists.denx.de (Postfix) with ESMTPS id E5342C21EB1 for ; Tue, 2 Apr 2019 12:42:00 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id p6so6508609pgh.9 for ; Tue, 02 Apr 2019 05:42:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pDBkkIcAWULECuzx6Wms/s2xSilKhPFu5JBL2EbFwUw=; b=lholVV5Y2xzS3Qc0beqKtWpxJyDtxiyud3Cfskb7C26ZpziWhhMGWBgQE/xdAv8dOo Q9NFogs3aBsoLPpknH+8rMbpRqmz6dTiBKwXBRIFpIKUUwl4bUkbqUXPoVpu0svVqO4J dKD29HaxFVBtPb7sRUQoqH64xIoSwbqAtd9lN/w9ooeNsfKlrEWYMOXzwH3nmd+avXNV yCQhXSuCjHXr0U59JzUPRZhnYCocysme9IDGf5Rnd5uTfmsSWDJL+6nzdng92iqA93us qYg0a1TYO7u48av+X11n6Ckr6QjY8XseDXm9kQf9pT5ztK/+SzJIURjzHOebBFLpF8PJ AgmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pDBkkIcAWULECuzx6Wms/s2xSilKhPFu5JBL2EbFwUw=; b=T7n6AcRXKUuynCmi4s4X7n0NBTublQlhnPdAa3yJ0niMnpX76IfJoQgMSlRYH48R6B txpugqPBsYw9a1nlBbmo6mdGvjroIPQhw33/ebo4q67f+NwaJt2GYxOWpLdiAZOkrgpb 9PC6fSbaozI33SHmSgnypyqFie2dtxKwg61KPtWhJGw0aPQZ6GF8Vrkb9RP1gUwy9T2A PM04y/iFxoK79W5rB9+QBJyBVhFpsrFFI4sH3TdsihTMk5p4ZP5PlmsbwcO89YREZUiR iAo6GXqjmxwUeMGBqkMsOuiPkUxiIJC7LN2tE23I5rNFyl/rxc0eBttsI0hyFfFMneW6 S1uA== X-Gm-Message-State: APjAAAWBR+pv26bhwEyfK+FDLEir30mN5NKLDeAKksc0+kPCZMlkOk1L eX9LGKy0Y4v91nzsRCnbXOm8nsGt X-Google-Smtp-Source: APXvYqzNPj3QyrZs3loNnk7GmGZZjCbrYS6/o/vAZfsKkzNKYpBF3etkM/aFG8DZcdebwDoSd51a9A== X-Received: by 2002:a62:5206:: with SMTP id g6mr52400486pfb.227.1554208919234; Tue, 02 Apr 2019 05:41:59 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:41:58 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:25 +0800 Message-Id: <20190402124129.7870-8-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: Michal Simek , Ryder Lee Subject: [U-Boot] [PATCH v6 07/11] sysreset: enable driver support in SPL/TPL 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" SPL/TPL also need use sysreset for some feature like panic callback. Signed-off-by: Kever Yang --- Changes in v6: - update defconfig for stm32mp15_basic, am65x_evm_r5, mt7629_rfb, x86, sandbox... to enable SPL_SYSRESET. arch/Kconfig | 1 + arch/arm/Kconfig | 1 + configs/am65x_evm_a53_defconfig | 1 + configs/am65x_evm_r5_defconfig | 1 + configs/mt7629_rfb_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/sysreset/Kconfig | 18 ++++++++++++++++++ drivers/sysreset/Makefile | 2 +- 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/arch/Kconfig b/arch/Kconfig index 2f3d07c13a..562f9ea692 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -158,6 +158,7 @@ config X86 imply DM_USB imply DM_VIDEO imply SYSRESET + imply SPL_SYSRESET imply SYSRESET_X86 imply USB_ETHER_ASIX imply USB_ETHER_SMSC95XX diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 18e8d9355c..3f67d98755 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1433,6 +1433,7 @@ config ARCH_STM32MP select SYSRESET select SYS_THUMB_BUILD imply CMD_DM + imply SPL_SYSRESET help Support for STM32MP SoC family developed by STMicroelectronics, MPUs based on ARM cortex A core diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index 8f6fd25531..23db645c24 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -68,4 +68,5 @@ CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig index 49498b13b6..0371189688 100644 --- a/configs/am65x_evm_r5_defconfig +++ b/configs/am65x_evm_r5_defconfig @@ -82,6 +82,7 @@ CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_TI_SCI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig index 459c67827d..f9de4b26df 100644 --- a/configs/mt7629_rfb_defconfig +++ b/configs/mt7629_rfb_defconfig @@ -64,6 +64,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_QSPI=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 012f3342ac..784a2fe4bb 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -174,6 +174,7 @@ CONFIG_SANDBOX_SPI=y CONFIG_SPMI=y CONFIG_SPMI_SANDBOX=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_TIMER=y CONFIG_TIMER_EARLY=y CONFIG_SANDBOX_TIMER=y diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index 8ce3e2e207..d456f0ce36 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -13,6 +13,24 @@ config SYSRESET to effect a reset. The uclass will try all available drivers when reset_walk() is called. +config SPL_SYSRESET + bool "Enable support for system reset drivers in SPL mode" + depends on SYSRESET && SPL_DM + help + Enable system reset drivers which can be used to reset the CPU or + board. Each driver can provide a reset method which will be called + to effect a reset. The uclass will try all available drivers when + reset_walk() is called. + +config TPL_SYSRESET + bool "Enable support for system reset drivers in TPL mode" + depends on SYSRESET && TPL_DM + help + Enable system reset drivers which can be used to reset the CPU or + board. Each driver can provide a reset method which will be called + to effect a reset. The uclass will try all available drivers when + reset_walk() is called. + if SYSRESET config SYSRESET_GPIO diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index b3728ac17f..8e1c845dfe 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -2,7 +2,7 @@ # # (C) Copyright 2016 Cadence Design Systems Inc. -obj-$(CONFIG_SYSRESET) += sysreset-uclass.o +obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset-uclass.o obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o obj-$(CONFIG_ARCH_STI) += sysreset_sti.o From patchwork Tue Apr 2 12:41:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074373 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aLvilh8t"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTVR4zwyz9sP7 for ; Tue, 2 Apr 2019 23:46:39 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4431CC21E1E; Tue, 2 Apr 2019 12:43:51 +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.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 39C5AC21E52; Tue, 2 Apr 2019 12:43:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1499CC21E7E; Tue, 2 Apr 2019 12:42:07 +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 6805FC21E76 for ; Tue, 2 Apr 2019 12:42:03 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id c207so6334719pfc.7 for ; Tue, 02 Apr 2019 05:42:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JglKg4B/rdV5mMMtCEppkEwEjIMfKiOSYPJEtC7hR2A=; b=aLvilh8tcHFlMSJmiMiuH5RecbPA7wvUhq7Dyh73uLK6Hz8kAMoxxDiWE0ej0JsTcM Mrwi0q6SmhqOzLouGxYQ6HkPVvjxcGTsGNbmeDQBqKbaGNp7+hmobnA2dDHxObOODIUM Zxs3Z4pIshN9qJQHVmTVTxphbxZxez1FXe/oBnpCuoD+nQniOfSJjgnE8lgSnl6dB3/g lm2AQEMRP66ZnhjUSvjH0qzsMhN88ejZyE9jOncEDn1Wk86M2UezaKyfmYHM48zNwnph QBDt+t0M3HeZhYEojK5UgmLUScDarl88+zM+AOvHk5rcWhxWryakQsS0CHTtIIYGJtAo uGtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JglKg4B/rdV5mMMtCEppkEwEjIMfKiOSYPJEtC7hR2A=; b=iqUJlf/RtYNlOVK0ju/40/+ZnjeylzblW5YjA9751urhD6GY9bakXLVbJzhldHX3N+ MOiLBxuThIuhyFTf7mAZpQ+FqaGh12pzq6gC6NqIozFNmIFe2cMYnjBJS+e1VNv4ojW4 vxJDVfUo8dqvBQQgk7eh5NmBM1wDSRCu6cbU9ZwSF/XpCZ1uZntJD5iCMF+oqz5ZcK59 IpzW+2SciQ2GPyrBPskhHUd/F6Z/TKg0FIOAYEPBGxsmMd1xNBQHk0hVKlGX149m947O kxFLVUzwg1S/Q4DjtH5tkCjE+eOkBs6hImQxK/kHZMTwcVGkJNO6g3mjrFvPKx7XvQjg CUnA== X-Gm-Message-State: APjAAAVP60LMYjMeqFqZf5RBhV/ZJCWlE9nf0VHqE68lVCddl39Sp0DK NfmffF5KaTk04E2kx4zmajnkekl0 X-Google-Smtp-Source: APXvYqw4AKSaHpb35rT+XBxOVc0Rt3c5FB6rgYXVzfkqS/lR236hxmSlnLL3WiK+OWEQUMlSs+ySgw== X-Received: by 2002:a63:5f05:: with SMTP id t5mr15899237pgb.176.1554208921731; Tue, 02 Apr 2019 05:42:01 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.41.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:42:01 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:26 +0800 Message-Id: <20190402124129.7870-9-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Cc: Fabio Estevam Subject: [U-Boot] [PATCH v6 08/11] rockchip: rk322x: dts: enable uart2 for SPL/TPL 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" When we use DM_SERIAL for serial driver, we need enable the dts node for the debug console. Signed-off-by: Kever Yang --- Changes in v6: None arch/arm/dts/rk3229-evb.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/dts/rk3229-evb.dts b/arch/arm/dts/rk3229-evb.dts index bfb367ac99..632cdc9bc3 100644 --- a/arch/arm/dts/rk3229-evb.dts +++ b/arch/arm/dts/rk3229-evb.dts @@ -82,6 +82,7 @@ }; &uart2 { + u-boot,dm-pre-reloc; status = "okay"; }; From patchwork Tue Apr 2 12:41:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074374 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="flypzreM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTVc6CVtz9sP7 for ; Tue, 2 Apr 2019 23:46:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2C30EC21E52; Tue, 2 Apr 2019 12:44:17 +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.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BF9B0C21E76; Tue, 2 Apr 2019 12:43:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0C362C21E62; Tue, 2 Apr 2019 12:42:09 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id C4AADC21EB1 for ; Tue, 2 Apr 2019 12:42:05 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id p6so6508727pgh.9 for ; Tue, 02 Apr 2019 05:42:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Pk3l241t5SyHsq1pGDOLDCIiYg85AyR4uclENK6GaUk=; b=flypzreM3ZnRDBmjqbUcIJ3wSJwRUVxC4XS1HuqdxibbPdTw7QZj2ToUqQR55pe4fO 5wEeW2rvQVX/w/YYth7f0nr3vSoqxIlhTwI6SadVTe/k7gcailkSQqTaLDNLE2tKad8f P8BDPdrW2btOKFxcqw24EgjxFnoB/18a1d7wdN2vjxCgG7uCI5hpXj5ovRniisETVxki xFW9a/lK9iRmmlWuk+9by5GhSaT9X2XCaBl2D7OPYhU3g7P7IPB7qPczd3SCS+uAsAeS WoVOTuMPP+Qtfxnap2U42wigjSGyAvuOBrBTobFmREh59GjcaCtXTvA3aSR6B0nUob/X O+ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Pk3l241t5SyHsq1pGDOLDCIiYg85AyR4uclENK6GaUk=; b=dYwU8mChdSAH4sdqeHMOj0GFUqX7HUKC0CJd2qq74uzbxx2YjWEScgdJbeOdEuuFWy fUprMDM+dFAvJnEgWMIQfjZPA/Y3NJeCQAa4FKJDhfDylr5tG/cBEVvKd4yG5XajTw9z 0TAxivSu8MriFsO1QebwI9tvi4iFE6b9xA3CPJXi6ttNtqKgmxcWHgjYHTFUxoIUbq5D +M54MSJD9pCJRRGvKN+XnzUr8S1Xs9f+OgyzyL8eYCDJ2YARX9pLE0fVkEczWJAkzZcp tck4i776qhYFPnd6Gdft4aU1VmV9tb/B6131SUApsVBoL1uupfOpudNCUjh0DMjKkUa7 yP3w== X-Gm-Message-State: APjAAAVTKgdb1PWlYK2MLbCJhgZx7WxjYwTfBR/ugEB08YVtz8Bn0Qef YVW2L6aBjQGgdTNnQMA15smhh50l X-Google-Smtp-Source: APXvYqyoac3rJL08a/gf9hQlXmO0erSpTzIjzTBm6JAOhnGVZS8atwZmZt8rMmqYn1406KDA4bJPQw== X-Received: by 2002:aa7:8c42:: with SMTP id e2mr38404724pfd.24.1554208924049; Tue, 02 Apr 2019 05:42:04 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.42.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:42:03 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:27 +0800 Message-Id: <20190402124129.7870-10-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 09/11] rockchip: evb-rk3229: remove unnecessary defines 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" Prefer to use default setting like other SoCs. Signed-off-by: Kever Yang --- Changes in v6: None include/configs/evb_rk3229.h | 44 +----------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/include/configs/evb_rk3229.h b/include/configs/evb_rk3229.h index 369b0bc68a..6a91a82ceb 100644 --- a/include/configs/evb_rk3229.h +++ b/include/configs/evb_rk3229.h @@ -8,48 +8,6 @@ #include - -/* Store env in emmc */ -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_SYS_MMC_ENV_PART 0 -#define CONFIG_SYS_REDUNDAND_ENVIRONMENT - -#ifndef CONFIG_SPL_BUILD -/* Enable gpt partition table */ -#undef PARTS_DEFAULT -#define PARTS_DEFAULT \ - "uuid_disk=${uuid_gpt_disk};" \ - "name=loader_a,start=4M,size=4M,uuid=${uuid_gpt_loader};" \ - "name=loader_b,size=4M,uuid=${uuid_gpt_reserved};" \ - "name=trust_a,size=4M,uuid=${uuid_gpt_reserved};" \ - "name=trust_b,size=4M,uuid=${uuid_gpt_reserved};" \ - "name=misc,size=4M,uuid=${uuid_gpt_misc};" \ - "name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \ - "name=boot_a,size=32M,uuid=${uuid_gpt_boot_a};" \ - "name=boot_b,size=32M,uuid=${uuid_gpt_boot_b};" \ - "name=system_a,size=818M,uuid=${uuid_gpt_system_a};" \ - "name=system_b,size=818M,uuid=${uuid_gpt_system_b};" \ - "name=vendor_a,size=50M,uuid=${uuid_gpt_vendor_a};" \ - "name=vendor_b,size=50M,uuid=${uuid_gpt_vendor_b};" \ - "name=cache,size=100M,uuid=${uuid_gpt_cache};" \ - "name=persist,size=4M,uuid=${uuid_gpt_persist};" \ - "name=userdata,size=-,uuid=${uuid_gpt_userdata};\0" \ - -#define CONFIG_PREBOOT - -#define CONFIG_SYS_BOOT_RAMDISK_HIGH - -#undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND \ - "mmc read 0x61000000 0x8000 0x5000;" \ - "bootm 0x61000000" \ - -/* Enable atags */ -#define CONFIG_SYS_BOOTPARAMS_LEN (64*1024) -#define CONFIG_INITRD_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG - -#endif +#define CONFIG_SYS_MMC_ENV_DEV 0 #endif From patchwork Tue Apr 2 12:41:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074372 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L/vIawpb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTVG0LGlz9sP7 for ; Tue, 2 Apr 2019 23:46:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B8EACC21EBB; Tue, 2 Apr 2019 12:43:25 +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.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E495AC21ECC; Tue, 2 Apr 2019 12:42:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 828E9C21DCA; Tue, 2 Apr 2019 12:42:11 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by lists.denx.de (Postfix) with ESMTPS id DB16CC21E96 for ; Tue, 2 Apr 2019 12:42:07 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id 10so6336013pfo.5 for ; Tue, 02 Apr 2019 05:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yfzc+mlMPWESZzkmdQr4EkTm3PkHmdwBx08RBhJlJaY=; b=L/vIawpb/pZRuHrbsPLUy/eA/03UaxeYQAeaaVuCON4imAYVMrJN8XevyRWpIJDBwZ DAFUx7vNLi/lSIjVRHmW7kXKWvk7wvNURMIIU1L2eijH2hFisqNQUFuy2BcD5eX3Pzep tISyhz932QbLNnOfDMKhPm9yjNNJkEPaV6lx2QI2r4sp0ogpJ4q88quT8W78HPOxZZtr Dm9CmJrgushbRr7+9CW6g3HbxfEr0ByETlzzQa+E4h3vO8SjE+X4kGtGHMnZX9ikG8i2 rf14LXmwU7oLSEu4T0k91a5p1L8Tuv96Dr5uxoFB+Qyfkimzb3NRKgS4IOiSY4taRygK Mmfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Yfzc+mlMPWESZzkmdQr4EkTm3PkHmdwBx08RBhJlJaY=; b=IjnaG3L3/69wSIS4GwW67OcnvVmd5DC1NjWjrBBAAqgQJwJM839IbGX4YY87vsNlvK TipwcLfKCm+TzZaLOfnHfpcG/t5O9lD0/aTJMAg6rxy1i3+LNRW5+Ku3peTaB9nKbb/U ObUcvyfGFpOAre1kSR0X6GKh2RQpTEKhCXBvalKmj+IvN+piHdapypvsBk8i969bE1y4 XNcKua00lU79V0ANOty9DWIeRlJuXhRTicnJLbRPtPRQAAy5m0YpCee9LHfpMqnBCD8v xCGca0QbwjHahU7upZ/Z9ys4ESrgdV3ZDXTSggTh1Es5Tdl8s0fc1ldMwfrMdvoQiSqV Xkww== X-Gm-Message-State: APjAAAXXzwr6ve/y/fzW1PgoOtSXl2RV1FSOypPiOhfWowaXe1eMK2gV DrctokRazQUNt7odw2FIMqFTyplx X-Google-Smtp-Source: APXvYqyQxgrDh/SLyuYe0K4OpZzv4IXb990khRsNSjQI3QcCS1KmMRT//puTVSSyJ4Ngebz2kgoYoA== X-Received: by 2002:a62:e418:: with SMTP id r24mr69369307pfh.52.1554208926137; Tue, 02 Apr 2019 05:42:06 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.42.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:42:05 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:28 +0800 Message-Id: <20190402124129.7870-11-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 10/11] rockchip: evb-rk3229: add README file for OP-TEE support 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" Detail of step by step to bring up the board with OP-TEE support. Signed-off-by: Kever Yang --- Changes in v6: None board/rockchip/evb_rk3229/README | 72 ++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 board/rockchip/evb_rk3229/README diff --git a/board/rockchip/evb_rk3229/README b/board/rockchip/evb_rk3229/README new file mode 100644 index 0000000000..93328c75b2 --- /dev/null +++ b/board/rockchip/evb_rk3229/README @@ -0,0 +1,72 @@ +Get the Source and prebuild binary +================================== + + > mkdir ~/evb_rk3229 + > cd ~/evb_rk3229 + > git clone git://git.denx.de/u-boot.git + > git clone https://github.com/OP-TEE/optee_os.git + > git clone https://github.com/rockchip-linux/rkbin.git + > git clone https://github.com/rockchip-linux/rkdeveloptool.git + +Compile the OP-TEE +=============== + + > cd optee_os + > make clean + > make CROSS_COMPILE_ta_arm32=arm-none-eabi- PLATFORM=rockchip-rk322x + Get tee.bin in this step, copy it to U-Boot root dir: + > cp out/arm-plat-rockchip/core/tee-pager.bin ../u-boot/tee.bin + +Compile the U-Boot +================== + + > cd ../u-boot + > export CROSS_COMPILE=arm-linux-gnueabihf- + > export ARCH=arm + > make evb-rk3229_defconfig + > make + > make u-boot.itb + + Get tpl/u-boot-tpl.bin, spl/u-boot-spl.bin and u-boot.itb in this step. + +Compile the rkdeveloptool +======================= + Follow instructions in latest README + > cd ../rkflashtool + > autoreconf -i + > ./configure + > make + > sudo make install + + Get rkdeveloptool in you Host in this step. + +Both origin binaries and Tool are ready now, choose either option 1 or +option 2 to deploy U-Boot. + +Package the image +================= + + > cd ../u-boot + > tools/mkimage -n rk322x -T rksd -d tpl/u-boot-spl.bin idbloader.img + > cat spl/u-boot-spl.bin >> idbloader.img + + Get idbloader.img in this step. + +Flash the image to eMMC +======================= +Power on(or reset with RESET KEY) with MASKROM KEY preesed, and then: + > cd .. + > rkdeveloptool db rkbin/rk32/rk322x_loader_v1.04.232.bin + > rkdeveloptool wl 64 u-boot/idbloader.img + > rkdeveloptool wl 0x4000 u-boot/u-boot.itb + > rkdeveloptool rd + +Flash the image to SD card +========================== + > dd if=u-boot/idbloader.img of=/dev/sdb seek=64 + > dd if=u-boot/u-boot.itb of=/dev/sdb seek=16384 + +You should be able to get U-Boot log message with OP-TEE boot info. + +For more detail, please reference to: +http://opensource.rock-chips.com/wiki_Boot_option From patchwork Tue Apr 2 12:41:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 1074375 X-Patchwork-Delegate: ykai007@gmail.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=rock-chips.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bjParp+6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44YTVq0r0qz9sP7 for ; Tue, 2 Apr 2019 23:46:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AFC35C21E63; Tue, 2 Apr 2019 12:44:05 +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.8 required=5.0 tests=T_DKIM_INVALID, UPPERCASE_50_75 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 1A138C21EB4; Tue, 2 Apr 2019 12:43:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E492FC21EBF; Tue, 2 Apr 2019 12:42:13 +0000 (UTC) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by lists.denx.de (Postfix) with ESMTPS id 0248FC21E8A for ; Tue, 2 Apr 2019 12:42:10 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id i2so6512239pgj.11 for ; Tue, 02 Apr 2019 05:42:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0l3lV61G6NIAJjLzJ3CdZC5QOP9pyt2yaJT12fFooaw=; b=bjParp+60606Q7FytZKz3CYCJeMlF9FbKkLZrw/5I72BrMcjcw2b/EnCwWIoZtgs9z cI4p0YOMaVNprnkfBoUSi2xjgCdYVtCXEiTWlYsJZJ3oSHnYYjMD+S+geLeJBsQb4lzi WBRzDG/bJT4wqOSH8lS3r2YFyc6ILnWcrRmGeD2p6BVqj5lsKNeLJRYsXq7ZSByZQ5kw vtqs7gx/rOSDnDcDSAE+gnTwjWC/Id8DwphV4UPVEvVJbT8rRjtLCn1c2zhJw19qs9+e djoB6Xch0AIVMpdK2SEWp11w9TCd+k1MHmCGirpcV+YXnbkqy/lYvnPgobieRtisIqzy +N1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0l3lV61G6NIAJjLzJ3CdZC5QOP9pyt2yaJT12fFooaw=; b=BQIRsOiDEoy2vTdPVay2/l56ua1VQx08dELg4ia6q8nd6q4YRZU8qLNM549+9Nh57O ySWA18MTbnQJmnch4uDy98E5s00qBd3YZULfAxHnXpk/nlSS9AQkYh7VHHZm/P8c8oXB dzhNd8aQr3ymkkwqv8xhcKmUXh/YQ69MaoWwdr8PzqkPatZNrNTz9A17zXHzlJER8M2b 0Tt+rqh8pt0OcphVjR9QeOv8VNqEYJOUGFG/IUP4AvM3crMLe2Pj7ucTCdwgfyP17xK5 a1zRVNaw9u4GlJORrbOBy5vXZtp5olFJ+HAlHpQlq7Nc4IaByvjL8aYMZC8xlO5UIGSo fJkw== X-Gm-Message-State: APjAAAVjrrA6TAKeUTIIR7qSE97FzUyw7p4ocqrCA0rDNcmwLRxDtH7g zGAhhjsuc85RyDpaeELIauCdJhif X-Google-Smtp-Source: APXvYqwCAXXtFrGYWLa/DOd7Xvl1Kdzucsyj3serH5i06Po549MrZ6oFxaxVQkA6sDlEqfktfbmjAQ== X-Received: by 2002:a62:47d0:: with SMTP id p77mr67139524pfi.95.1554208928264; Tue, 02 Apr 2019 05:42:08 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id q80sm15788484pfa.66.2019.04.02.05.42.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Apr 2019 05:42:07 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Tue, 2 Apr 2019 20:41:29 +0800 Message-Id: <20190402124129.7870-12-kever.yang@rock-chips.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190402124129.7870-1-kever.yang@rock-chips.com> References: <20190402124129.7870-1-kever.yang@rock-chips.com> MIME-Version: 1.0 Subject: [U-Boot] [PATCH v6 11/11] rockchip: evb-rk322x: update defconfig with tpl and optee support 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 all the options for TPL/SPL and OPTEE. Signed-off-by: Kever Yang --- Changes in v6: None configs/evb-rk3229_defconfig | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index 14ff54af20..8ad48bad68 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -1,37 +1,51 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_SYS_TEXT_BASE=0x61000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_ROCKCHIP_RK322X=y -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_TARGET_EVB_RK3229=y CONFIG_DEBUG_UART_BASE=0x11030000 CONFIG_DEBUG_UART_CLOCK=24000000 -CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_SPL_STACK_R_ADDR=0x60600000 CONFIG_DEBUG_UART=y CONFIG_NR_DRAM_BANKS=2 +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_OPTEE=y +CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its" CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x200 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl.lds" CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y +CONFIG_TPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" 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_NET_RANDOM_ETHADDR=y CONFIG_REGMAP=y CONFIG_SPL_REGMAP=y +CONFIG_TPL_REGMAP=y CONFIG_SYSCON=y CONFIG_SPL_SYSCON=y +CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y +CONFIG_TPL_CLK=y +CONFIG_FASTBOOT_BUF_SIZE=0x04000000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y @@ -46,6 +60,7 @@ CONFIG_PHY=y CONFIG_PINCTRL=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y @@ -57,3 +72,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x320a CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_ERRNO_STR=y +CONFIG_TPL_TINY_MEMSET=y +CONFIG_USE_TINY_PRINTF=y