From patchwork Thu Jan 4 07:07:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855420 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jHKWXx+7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzQX6C4Bz9s74 for ; Thu, 4 Jan 2018 18:07:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6FE33C21DE8; Thu, 4 Jan 2018 07:07: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_DNSWL_BLOCKED, 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 4B9D5C21CB1; Thu, 4 Jan 2018 07:07:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 371EDC21C2B; Thu, 4 Jan 2018 07:07:35 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 97F49C21D5D for ; Thu, 4 Jan 2018 07:07:34 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id i6so573991plt.13 for ; Wed, 03 Jan 2018 23:07:34 -0800 (PST) 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; bh=x5mLglahafSBvMS1beicuwxbIlvRIpFhFGUG8wNeO8k=; b=jHKWXx+71QVOBUFgFWhD4e6wOyvChrCapj4rgzDDwgcvBdb5AuOsEOcBVukEhx4t2B dcWsshW+1pPOXx0ODFEQ5v5dlJQcDvYvGz0ag3G18n7TUcgHSsGmRtilVfUpAHh2aRab WJ7YeVN81ZE7UprnktkdEVQNg/JkrmZB2/PxjYHcV7nzwLhPaOA/H+W6kErXcSN0wqFX E0zlJojqlJsQo1sse0ReFT8eORWHNI9McP6ovsck+TBPNhOVTCIvMn3l9umjXLkuw6LS GEF0CAqoQ9834UfBIwh4X5sRNWoG/sgoHcWZkZsiN9iWq017j5OBbu2X6M0b7THvmcdc 0D/Q== 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; bh=x5mLglahafSBvMS1beicuwxbIlvRIpFhFGUG8wNeO8k=; b=jVvhkwW/UMqs2a8kMQlSWz/YTVqC+bwpNijKz3rC1tPslqrtGn3mjYH7ekpYBHprK2 4aVltBSvbpmbVYoqdP5iRIgbZZvz6v7oHMIo9rgKvAZ2c96uOvQTfrrFBUj3vM52+W/U SvUkfS4UP61MsxC0ghuT4nKnO4u3PUExnN7p8M3xWm+MZ57SYLAM+4Xqq0wjxDCzwlkG eDyh9hL2/Ps6K866Hq2TEBNEf8r9F6fEtAmIKxjKArrAfxbpjDurszeGlFIRj6LZ9Mci ySZsGZ8LzK13r+L5L+WkJpU0egaa9B4MBYxY7b5px84qkFPm2lov3AdMHpuk7TIm/R6Z ZdKg== X-Gm-Message-State: AKGB3mLA+8R4SXO2vLe67vX2j6UraRAYopl2fNu8GZZTiAmC2HScv5i3 QgTL5m0Vlq7in0DwPtkI6J5Hng== X-Google-Smtp-Source: ACJfBovkEHyJF+KsV52M3T5GPzVKIdzEP/EuS/Jb6JGeO5lA4YDfxbjW0z90XD+Rk1FhRg7iIpGOYQ== X-Received: by 10.84.195.36 with SMTP id i33mr3653757pld.27.1515049653045; Wed, 03 Jan 2018 23:07:33 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.07.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:07:32 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:00 +0800 Message-Id: <1515049636-13513-2-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Cc: Andre Przywara , Nandor Han , Jagan Teki , Maxime Ripard Subject: [U-Boot] [PATCH v4 01/11] lib: add TPL_OF_LIBFDT option 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" TPL may need use libfdt for dt decode, add option for it. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: None lib/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Kconfig b/lib/Kconfig index 00ac650..5af421c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -244,6 +244,16 @@ config SPL_OF_LIBFDT particular compatible nodes. The library operates on a flattened version of the device tree. +config TPL_OF_LIBFDT + bool "Enable the FDT library for TPL" + default y if TPL_OF_CONTROL + help + This enables the FDT library (libfdt). It provides functions for + accessing binary device tree images in memory, such as adding and + removing nodes and properties, scanning through the tree and finding + particular compatible nodes. The library operates on a flattened + version of the device tree. + config FDT_FIXUP_PARTITIONS bool "overwrite MTD partitions in DTS through defined in 'mtdparts'" depends on OF_LIBFDT From patchwork Thu Jan 4 07:07:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855421 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rFVQZYYR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzRL1Px4z9s7n for ; Thu, 4 Jan 2018 18:08:29 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7897AC21DBB; Thu, 4 Jan 2018 07:07:55 +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_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 1B02CC21CB1; Thu, 4 Jan 2018 07:07:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D1551C21D9F; Thu, 4 Jan 2018 07:07:41 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id 6B1FCC21DB5 for ; Thu, 4 Jan 2018 07:07:37 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id v26so421853pfl.7 for ; Wed, 03 Jan 2018 23:07:37 -0800 (PST) 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; bh=eSTy4AwqpJvze30T4nJxqodipH/J6nj0zRW3DtGVjd4=; b=rFVQZYYRINk1QQnLqUPeVKeVSYmsSZhzDnCrxzLx/PqnxvBWIxdd0P8cyRYuymblqB mtWXt+0KWONrRpnnwnDacCPtgotTKMYw0RQhoArAr53yBi13wSmV39+3n/vREbDLOM5H eJxyclRkHYWDSjQCD2qFttsnL8Wb2gYQu/TOKaeFJ0A3OZKGY+ezSlOl4+8gkRYUdSbj 1tPnIAYEfSLRR8dn4y1SM/RzZ+hdjdqHqqn+4NOhiT8HHrOWIphui6Is3sszwPuSRyzI EM1DAiTmBJIpBQgjnoRUq5cTpurImdz6Bxl18qu1bPjMKiYfGL78I/CaFkTLD1EgWsNH mbpw== 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; bh=eSTy4AwqpJvze30T4nJxqodipH/J6nj0zRW3DtGVjd4=; b=LXoU/TcM7kGrfjp8D5wCpS6Wl9Wtg6rgJouZYEPHNEGvqv1HHHRhuliOeezekDlSd3 Z0qJSv1QK6QrH7xuOnWFsQVnwMb725DY1jvrDf2FALdPO5jzfrCQgAqNezn0D6RotRGG Mvej6uyHDcC6ftrHnsUO0ei8n3K3bR/3fmJUlf3xmRFPAbR0E51X5KLZElgQ6f5rI42o y63VfvV6i6snBCl1eLQrmEE2btzTaU8SDQZQRE8v9ADu2alpQwgCpvYVlxExDjdvoC56 T6pMqTazYRAB/k4dH1ZyYX/u8awFb8VoNz933Tv3EPiIqMBTcSV1Je3MRBK2FtGlSgP1 WdbA== X-Gm-Message-State: AKGB3mKm7z+TWoC9gtNfUEwO1wV7kneK4DewIbwXKgrJFZ1tctvi1KEc cIdq+HxYinGFnufUPP2h5g6L5A== X-Google-Smtp-Source: ACJfBos/4JDoWygKzlpdw3w3xkvCYh0btrDVC4MVvGhN3FMC0cN6Npm9N0XoeS5blu5Cf2qECoaQxg== X-Received: by 10.99.183.14 with SMTP id t14mr3243472pgf.147.1515049655666; Wed, 03 Jan 2018 23:07:35 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:07:34 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:01 +0800 Message-Id: <1515049636-13513-3-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 02/11] arm: add option for TPL ARCH_MEM 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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: - update subject with ARCH_MEM info arch/arm/Kconfig | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f2c35e3..fe4ca2a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -244,6 +244,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 @@ -280,6 +291,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 @@ -298,6 +318,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 Thu Jan 4 07:07:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855423 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ze2U8Pg1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzSq03GBz9s74 for ; Thu, 4 Jan 2018 18:09:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id ADF65C21CB1; Thu, 4 Jan 2018 07:08:16 +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_DNSWL_BLOCKED, 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 0555BC21DA6; Thu, 4 Jan 2018 07:07:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E1115C21DA6; Thu, 4 Jan 2018 07:07:44 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id A1957C21DDB for ; Thu, 4 Jan 2018 07:07:40 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id 77so383864pgd.8 for ; Wed, 03 Jan 2018 23:07:40 -0800 (PST) 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; bh=Q/I0eic6F/sANFVi5GMp2/kB92SHeXZba8XViA+SWoE=; b=Ze2U8Pg1xS+RcNVGEEZzDoex4unvZe1jfY+o+k1+IvxQtzDJbHQ5RknSqA/PvofKZm gREKyTkN96fDnF+xRyDJkiFat33bL4q8ssS9gS7t7hbY8FdAK5waN9udjXpVgzhbw6pk w4NUvzni8TVI7SNc00kLHXUAe8sCshOWDjfz0slbTiMi+8QV9XnLwt5xLYXSrSeRLPZ0 rF6OBk4sifdi4ve468CBFO/4Cmd8sMgSaknVGlxlFXXF1KKbMztsQFYT1DBnAE+4gBBN iZenpTCftqyLuOD3PplcWeSxRcvyVl2H70n0pWI0cC9BPpks5w/5SpBEfGAF3APzov5h yYGg== 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; bh=Q/I0eic6F/sANFVi5GMp2/kB92SHeXZba8XViA+SWoE=; b=AaDFHcnlxVwQh97WIgRXOteY0ngLR2+h8G19FsZfU/ir7FOHUFsmR3hZAeCaOwCWPN KYhoQHMnmZfR5naOkQYSn1hA9zCjNfQtPbWlxc22AOBTw0PzJbIkef6WOZsoufwi2L6d IABwTrrDjHC3ABmSup7P9wofr187i6sjf8jF212kuiCHvH0F+CMFCbbbeGSILJF5M/uY GvzQ6RMINjVSST5RkwJ77RC6m8nfP9iVGNfx0vgbcY3+95F9GA/4RMmO73m/TB4CqZX8 ITclsCiMJWuLHy/xSMhQQSWHU3kGbs30iNBQ8rUnzPh++WTgS4Li3zc5ymoX6YEk2kzq PjPw== X-Gm-Message-State: AKGB3mJisYl/mxQvjipAOXiIdQLgxKTwVI7Z/cWsCdJu6JT53rf2jmf6 GUbdAdQDiOgDMqoNF3DBucdTDA== X-Google-Smtp-Source: ACJfBosMHz0PChcu66nEHE7hgddz44lPIWnfwgd6YsZ1VdMbWwiVziqTWSENAdv9H8YFacftRMuK5A== X-Received: by 10.99.49.75 with SMTP id x72mr3343208pgx.123.1515049659026; Wed, 03 Jan 2018 23:07:39 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.07.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:07:38 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:02 +0800 Message-Id: <1515049636-13513-4-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: 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 fa81317..3c1c603 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -70,7 +70,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 Thu Jan 4 07:07:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855422 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JW5LWCZ0"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzS854kGz9s74 for ; Thu, 4 Jan 2018 18:09:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3D137C21DA9; Thu, 4 Jan 2018 07:08:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, 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 24A70C21D5D; Thu, 4 Jan 2018 07:07:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 77D44C21DAB; Thu, 4 Jan 2018 07:07:47 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id AD456C21DBA for ; Thu, 4 Jan 2018 07:07:43 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id b12so588091plm.3 for ; Wed, 03 Jan 2018 23:07:43 -0800 (PST) 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; bh=QgeFBGs6FkD4cgqr/lxj+bUQWIHMXjQqKTwdPcsztdE=; b=JW5LWCZ0JZ9319wgkj6sWISKRsR59E89hu5TvOSwgGt2pcK1BNvHc8JLKK9A4UrOdT phDRW6injsNW4ccDupcAkNR6N+88Ilt/XaS1uMiRPpMKHY+B+L1A0Fq+9Dz6DObBKptW U9fBMKN9/C+MOcACRS1HMxRfi5x4M282a04pa7Y6Medu1RkXAbrkqQZHz5FY0HgXFf1p mMZ3zg/Grt6XRc5CGyH3MhurM1Yl2GnHCMrbT3jiIDWl4r3zvZGp5hKHI1N5qsipP/Z6 qY4f1pW0lotOixZUQymZ7NPnGUlv3lhr01CWL2bRsfLRey8/aR7PA7X/IbMPf6ybSJSU WF6A== 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; bh=QgeFBGs6FkD4cgqr/lxj+bUQWIHMXjQqKTwdPcsztdE=; b=nqRSS7vxY9BSg+9nuhNXuLH9y5vgWymdZcxi6SOU2UDcjxi0AyvBxYAMcjeVwM1iDa O7lm7hu+KsBMxCMhYxGlQGZRKfT4q0AkvyVbXGOuK3vfcy4FnW9WAkiCNGkzbD2e6A3U 6vjBrbhv7oK8xQXoT7+T1JUz9+LgOpZ/4th/NIYt2ub9HDdA2niIDgM0/gm48pEOOEAK wsHQW1NSFks7oJHjsCbEz13Fp7HIu6ECrcO7hq5pFOQJH49K0slokzgqLziyGqkFMecn dOy51BMtP05Oes01Z278nPfOVA32qUww8H16lvf2+1vW52eu76JwnjuJGF9DnaXK7SEP Bwmw== X-Gm-Message-State: AKGB3mIaAZHQ/6vYd/L98LFu/ajmSZRI6QaElxtCqkuL92pxXU5/sdbh caLA0PBkTQ+1BhHZMw7zzqV7gA== X-Google-Smtp-Source: ACJfBouezHtw8gRoKfYG8oxQnS7fwVn8sMstDVskMD58uz55L6YZ7aQzE9E420tBEnZ9ETY6t2L0Pg== X-Received: by 10.84.133.108 with SMTP id 99mr3832490plf.48.1515049662042; Wed, 03 Jan 2018 23:07:42 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.07.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:07:41 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:03 +0800 Message-Id: <1515049636-13513-5-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Cc: Chris Packham Subject: [U-Boot] [PATCH v4 04/11] rockchip: rk322x: enable 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: , MIME-Version: 1.0 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. Serial-changes: 2 - update upon latest source Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: - remove non-used MACRO define Changes in v3: - do not init ddr region in spl Changes in v2: None arch/arm/mach-rockchip/Kconfig | 9 +++ arch/arm/mach-rockchip/Makefile | 3 +- arch/arm/mach-rockchip/rk322x-board-spl.c | 63 +++++--------------- arch/arm/mach-rockchip/rk322x-board-tpl.c | 88 ++++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk322x/u-boot-tpl.lds | 13 ++++ include/configs/rk322x_common.h | 9 ++- 6 files changed, 132 insertions(+), 53 deletions(-) create mode 100644 arch/arm/mach-rockchip/rk322x-board-tpl.c create mode 100644 arch/arm/mach-rockchip/rk322x/u-boot-tpl.lds diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 967290f..dbc197c 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -46,9 +46,18 @@ config ROCKCHIP_RK322X bool "Support Rockchip RK3228/RK3229" select CPU_V7 select SUPPORT_SPL + select SUPPORT_TPL select SPL + select TPL + 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 DEBUG_UART_BOARD_INIT + 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 diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index e1b0519..3c14236 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -13,10 +13,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 35f4f97..89af1d9 100644 --- a/arch/arm/mach-rockchip/rk322x-board-spl.c +++ b/arch/arm/mach-rockchip/rk322x-board-spl.c @@ -5,77 +5,46 @@ */ #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include + +DECLARE_GLOBAL_DATA_PTR; u32 spl_boot_device(void) { return BOOT_DEVICE_MMC1; } -DECLARE_GLOBAL_DATA_PTR; -#define GRF_BASE 0x11000000 -#define SGRF_BASE 0x10140000 - -#define DEBUG_UART_BASE 0x11030000 +u32 spl_boot_mode(const u32 boot_device) +{ + return MMCSD_MODE_RAW; +} void board_debug_uart_init(void) { -static struct rk322x_grf * const grf = (void *)GRF_BASE; - /* Enable early UART2 channel 1 on the RK322x */ - rk_clrsetreg(&grf->gpio1b_iomux, - GPIO1B1_MASK | GPIO1B2_MASK, - GPIO1B2_UART21_SIN << GPIO1B2_SHIFT | - GPIO1B1_UART21_SOUT << GPIO1B1_SHIFT); - /* Set channel C as UART2 input */ - rk_clrsetreg(&grf->con_iomux, - CON_IOMUX_UART2SEL_MASK, - CON_IOMUX_UART2SEL_21 << CON_IOMUX_UART2SEL_SHIFT); } -#define SGRF_DDR_CON0 0x10150000 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("SPL Init"); - ret = spl_early_init(); if (ret) { - debug("spl_early_init() failed: %d\n", ret); + printf("spl_early_init() failed: %d\n", ret); hang(); } + preloader_console_init(); +} - 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; - } +#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); - /* Disable the ddr secure region setting to make it non-secure */ - rk_clrreg(SGRF_DDR_CON0, 0x4000); #if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT) back_to_bootrom(BROM_BOOT_NEXTSTAGE); #endif + 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 0000000..a10a7a1 --- /dev/null +++ b/arch/arm/mach-rockchip/rk322x-board-tpl.c @@ -0,0 +1,88 @@ +/* + * (C) Copyright 2017 Rockchip Electronics Co., Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +u32 spl_boot_device(void) +{ + return BOOT_DEVICE_MMC1; +} +DECLARE_GLOBAL_DATA_PTR; + +#define GRF_BASE 0x11000000 +#define SECURE_TIMER_BASE 0x110d0020 +#define SGRF_DDR_CON0 0x10150000 + +void board_debug_uart_init(void) +{ + static struct rk322x_grf * const grf = (void *)GRF_BASE; + /* Enable early UART2 channel 1 on the RK322x */ + rk_clrsetreg(&grf->gpio1b_iomux, + GPIO1B1_MASK | GPIO1B2_MASK, + GPIO1B2_UART21_SIN << GPIO1B2_SHIFT | + GPIO1B1_UART21_SOUT << GPIO1B1_SHIFT); + /* Set channel C as UART2 input */ + rk_clrsetreg(&grf->con_iomux, + CON_IOMUX_UART2SEL_MASK, + CON_IOMUX_UART2SEL_21 << CON_IOMUX_UART2SEL_SHIFT); +} + +void secure_timer_init(void) +{ + writel(0, SECURE_TIMER_BASE + 0x10); + writel(0xffffffff, SECURE_TIMER_BASE); + writel(0xffffffff, SECURE_TIMER_BASE + 4); + writel(1, SECURE_TIMER_BASE + 0x10); +} + +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(); + } + + secure_timer_init(); + /* TODO: use arm generic timer instead for armv7 */ + rockchip_timer_init(); + ret = uclass_get_device(UCLASS_RAM, 0, &dev); + if (ret) { + printf("DRAM init failed: %d\n", ret); + return; + } + + /* Disable the ddr secure region setting to make it non-secure */ + rk_clrreg(SGRF_DDR_CON0, 0x4000); +#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/rk322x/u-boot-tpl.lds b/arch/arm/mach-rockchip/rk322x/u-boot-tpl.lds new file mode 100644 index 0000000..841c803 --- /dev/null +++ b/arch/arm/mach-rockchip/rk322x/u-boot-tpl.lds @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2017 Rockchip Electronic Co.,Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#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 b22169d..5536b58 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -20,11 +20,10 @@ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SYS_NS16550_MEM32 -#define CONFIG_SYS_TEXT_BASE 0x60000000 -#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 -#define CONFIG_SYS_LOAD_ADDR 0x60800800 -#define CONFIG_SPL_STACK 0x10088000 -#define CONFIG_SPL_TEXT_BASE 0x10081004 +#define CONFIG_SYS_TEXT_BASE 0x61000000 +#define CONFIG_SYS_INIT_SP_ADDR 0x61100000 +#define CONFIG_SYS_LOAD_ADDR 0x61800800 +#define CONFIG_SPL_TEXT_BASE 0x60000000 #define CONFIG_ROCKCHIP_MAX_INIT_SIZE (28 << 10) #define CONFIG_ROCKCHIP_CHIP_TAG "RK32" From patchwork Thu Jan 4 07:07:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855424 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M7WR54Ib"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzTz18C7z9s74 for ; Thu, 4 Jan 2018 18:10:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D6E77C21C8F; Thu, 4 Jan 2018 07:08:58 +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_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 277DAC21DF0; Thu, 4 Jan 2018 07:08:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E8E24C21DB0; Thu, 4 Jan 2018 07:07:50 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id DC27FC21DE7 for ; Thu, 4 Jan 2018 07:07:46 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id u25so423553pfg.5 for ; Wed, 03 Jan 2018 23:07:46 -0800 (PST) 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; bh=ymUjQd0oDCqnRuE+AIhv1E6lZhlVP/96nHSSb1ofv1Y=; b=M7WR54IbJzUwoQNHB1PoYlzzDqkTMrhytEbhV7BcKJ6xWpAkRq/RLcFL/So/sze8Fa NhtVCoDHOqO5UUbtYZrqE4mgpHm6GCHJsY2YQ/2o2/lt5rTOUnogbb1rLdaUK9bdX/Or qQGfUNo9L/daM6Xg/wec+FpBuukTXfZZnq2i4vh/eOSJVMUZTbVgwQEnHTszgi9qn6eX hnbrFsTnATk7bc7o62pLSs3r9rx8gaSezh1zZZOnAYUR2UCuYddIls6TgxBFW6n0XeR/ bJUshPWUaW+fvNAjzZsIRCrQcUWJ8qVxfyDRt4g44K5UwGJk3cpwcpqK5D3QkYpbdxxW PfBQ== 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; bh=ymUjQd0oDCqnRuE+AIhv1E6lZhlVP/96nHSSb1ofv1Y=; b=pL5E3pd7XJw2fI95ZZIdAg3tgIId24xPW2Dm/5WXCgNgugyLJSSbKZvwIL7SHz1n9w Cp+Hcg+vkbW/IMRkC6MMMAexLroLVBL4huXf+rzLPOletX7FV0YDHmZ+oCMsb1jKi0NK s0KDWk7TchgtsG/78PaFwlAj2XHNILYqWNDbC4b2MzRstIovkabChpccCQHHx/9UBNSp 1+QNM83yyvEIJyXhRdhi425UvhS0n76EJ3pcECsz4su0dLE9ZCmMh3uOd9ESTc5DO5bq 2aVUCFdLShT3cb0y6fh1PpZ3TBuWFYSQLg+WNXAzapMWFvungzB1jq8yFhpgkh1kzrYN yz6w== X-Gm-Message-State: AKGB3mIVJgD3MCpV6ozzzxhto5+hWUZM/TknKXUaRDXHJSVhXBubNDTw srejA5/VQlO6P/aXNlAm5yXc7Q== X-Google-Smtp-Source: ACJfBoumnHULkOVzzP9tS7cDv0z4bQ3WxQFPGpj1NyXqBbilTWgjg+2MIQrKHsznGhb7onRIkPRXqw== X-Received: by 10.99.129.73 with SMTP id t70mr3324104pgd.424.1515049665299; Wed, 03 Jan 2018 23:07:45 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.07.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:07:44 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:04 +0800 Message-Id: <1515049636-13513-6-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Cc: Andy Yan Subject: [U-Boot] [PATCH v4 05/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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: None drivers/sysreset/Kconfig | 18 ++++++++++++++++++ drivers/sysreset/Makefile | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index a6d48e8..a61a7d3 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_PSCI diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index 2e9598e..00be747 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_SYSRESET) += sysreset-uclass.o +obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset-uclass.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o From patchwork Thu Jan 4 07:07:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855425 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eNSXA/e1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzVF3smZz9s74 for ; Thu, 4 Jan 2018 18:11:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EAE90C21DEF; Thu, 4 Jan 2018 07:10:50 +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_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 69204C21CB6; Thu, 4 Jan 2018 07:10:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0E1A2C21C8F; Thu, 4 Jan 2018 07:09:02 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id E69BAC21DC1 for ; Thu, 4 Jan 2018 07:08:58 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id m26so418055pfj.11 for ; Wed, 03 Jan 2018 23:08:58 -0800 (PST) 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; bh=eV0IlmEQc2x8L7dGfKKn+8JkJtBSZHfLHETmW03vvkE=; b=eNSXA/e1qkurklCH5/qr84pYb2Vvw+KPDfZhRiFrTQrA2IlVdWParO6O2Nij0d1Ojs 2CmlmlyAmxwG4pKMCvjROMXKpsPOsrNzyjnoVC8/6xYE9H3Fnmh1QLT4F4Bl+C8CSISN EWL93Uqn3aSX4zpGvPI3sDf05gDJR6v4POT4MA26IBhEcVRPUd+ZqZxWHtfuOit5lyHw tlpIaMgMGhbLOPn41O1ECm0TdnqMs4qlR8uk2YGeC/I4dhqFAGFGlAemV2vft9PPU9ST vt5aDqzYAu4PHsCD+Dczv8NUdzAATa0F4gY8n1zzyhmTwCgAzv4U/DLchztMMzcRa4Ix 85ug== 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; bh=eV0IlmEQc2x8L7dGfKKn+8JkJtBSZHfLHETmW03vvkE=; b=KCSx96JHxiEldO+fj73mWGu4WrD212nPiOb4AaVlYRgOKqrkTRlMtb3xIy3OKzJHMa z2EXw8akffo25gyG4Iy3sWyhGN/Asc3k42p8GhWQRhFourKEqO2lux0scOn76r2Nh33G 6TexOAeEke4wusi1J13BWwPUg4knuj0xfBlh0Mt9hfloaTX12gd9OEDS95F/UZ+6BHB7 TZDVmcfFMvsCg1c0ESQIwtwLW3lTN7a1avQb4P/aFBjcILNJaJblLSqCsfscbDK7gcot u9pdeJvr3gGYjF+eRLzesE8K55hc3QM160gJ5Wt7V1QqCB0KT30fsqpvuv4qLGRqdplG QZ6w== X-Gm-Message-State: AKGB3mJgjafeIHr46tD/BEdYafTPF5PZJe5fvWWDDqfJgEZ5zohVbCQ4 PNDzWpqQI+L3I6HgxaFrX00mrA== X-Google-Smtp-Source: ACJfBoseUVxSr1GrcYdsr3h2jjmWcwfAc7S3T+PPqRRnAFTLR07+7vT3cl4pR2kbjyVlY/KW/iXZ9Q== X-Received: by 10.99.131.72 with SMTP id h69mr3298303pge.22.1515049737351; Wed, 03 Jan 2018 23:08:57 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.08.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:08:56 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:05 +0800 Message-Id: <1515049636-13513-7-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Cc: Alison Wang , Pantelis Antoniou , Rick Altherr , "Franklin\"" Subject: [U-Boot] [PATCH v4 06/11] image: add os type for OP-TEE 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" OP-TEE is an open source trust OS maintained here: https://github.com/OP-TEE/optee_os Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: - Add new image type like ATF common/image.c | 1 + include/image.h | 1 + 2 files changed, 2 insertions(+) diff --git a/common/image.c b/common/image.c index e9609cd..92234e5 100644 --- a/common/image.c +++ b/common/image.c @@ -91,6 +91,7 @@ static const table_entry_t uimage_arch[] = { static const table_entry_t uimage_os[] = { { IH_OS_INVALID, "invalid", "Invalid OS", }, + { IH_OS_OP_TEE, "op-tee", "OP-TEE" }, { IH_OS_ARM_TRUSTED_FIRMWARE, "arm-trusted-firmware", "ARM Trusted Firmware" }, { IH_OS_LINUX, "linux", "Linux", }, #if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC) diff --git a/include/image.h b/include/image.h index a128a62..141ed00 100644 --- a/include/image.h +++ b/include/image.h @@ -153,6 +153,7 @@ enum { IH_OS_PLAN9, /* Plan 9 */ IH_OS_OPENRTOS, /* OpenRTOS */ IH_OS_ARM_TRUSTED_FIRMWARE, /* ARM Trusted Firmware */ + IH_OS_OP_TEE, /* OP-TEE */ IH_OS_COUNT, }; From patchwork Thu Jan 4 07:07:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855430 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q1BGKrIj"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzXr6NSkz9s74 for ; Thu, 4 Jan 2018 18:13:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8C7A0C21C29; Thu, 4 Jan 2018 07:11:28 +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_DNSWL_BLOCKED, 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 66FA1C21DC5; Thu, 4 Jan 2018 07:10:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B13ABC21DB9; Thu, 4 Jan 2018 07:09:08 +0000 (UTC) Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by lists.denx.de (Postfix) with ESMTPS id 377E5C21DC1 for ; Thu, 4 Jan 2018 07:09:04 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id 62so580106pld.7 for ; Wed, 03 Jan 2018 23:09:04 -0800 (PST) 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; bh=73eSRLUSKF7NAHgbE08Uakt6Zk+Y+OpwvsbXh8webvY=; b=q1BGKrIj5L9mpS8a5FO971zI9KFbfTZpCIybrFi+Fl0gxBfyudx/KdKoAOze4UfXBG nN03ZOnsAZYNKzyZh0W463UZGISKt9D62DhbtV0aJVapvEPEpTSLKDREtoA4ewblvvzK B4yBBMK59aW6289IoaLDvaD9Hr7jacD5yFZJOGodnjqkh+anJ5XDEf6oEfPuCiIqxIex mKS1tAVrgJGjDy5lgVoTRhNUWpY7PLV5SF8rqjTnrYK0REkAdwZjI9XtGsjmL+YBpvNg Ww0gz0Y7bcPbQm5Wk3J+3tqUmB16NYUsEa0r8+xEPKIu/SoYlJ/gJRFeXZAQHK+gHrK5 tnWg== 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; bh=73eSRLUSKF7NAHgbE08Uakt6Zk+Y+OpwvsbXh8webvY=; b=tz+a8sR+L7MJUF86B8hhCCCJc32esX7xQIUbIWvnL/+XipbDamR1byrB37tTA/c74u qmKPrdfdlhC0IKu1bDO0kgLy11gOztWYSpmS4Uso38I7frvgheqtoL775qltCXNlHaDM 0nEEwcrm5RG6qMkwPevDMmtb7nUltaAbSBakYHDSvpfa2QYfzlcYhPgxp3j2gMvHqSyD RqhdCs5+uojbVjeiYAGRg6+A3pjJEiPLUOQ0YKltbzWsVlPgh+m5z9MK9ojKDaM3lwIu RP7yzBJPtysm2eTq+mRikJqgmy+zQ//LMfdRIAm9avdmPjZkomNqVtPIQzvxWRJv/JWA NaUA== X-Gm-Message-State: AKGB3mKwEK1pZL26PrVZ9v+RFwIU3C4aVSiddVG+xvdcruJ33P/dxiUf ZOECTYRMdY7c0pykUrxAAChREg== X-Google-Smtp-Source: ACJfBoswESqZxzPp9NJzeFXIIrTA0cpLWymB3VoxI+mbCogrDyqbNuckCZLzTUiWlb9DOIWGvSQXjg== X-Received: by 10.84.241.137 with SMTP id b9mr3725767pll.441.1515049742608; Wed, 03 Jan 2018 23:09:02 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.08.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:09:01 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:06 +0800 Message-Id: <1515049636-13513-8-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Cc: Stefan Agner , Andre Przywara Subject: [U-Boot] [PATCH v4 07/11] spl: add support to booting with OP-TEE 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" OP-TEE is an open source trusted OS, in armv7, its loading and running are like this: loading: - SPL load both OP-TEE and U-Boot running: - SPL run into OP-TEE in secure mode; - OP-TEE run into U-Boot in non-secure mode; More detail: https://github.com/OP-TEE/optee_os and search for 'boot arguments' for detail entry parameter in: core/arch/arm/kernel/generic_entry_a32.S Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: - use NULL instead of '0' - add fdt_addr as arg2 of entry Changes in v3: None Changes in v2: - Using new image type for op-tee common/spl/Kconfig | 7 +++++++ common/spl/Makefile | 1 + common/spl/spl.c | 9 +++++++++ common/spl/spl_optee.S | 13 +++++++++++++ include/spl.h | 13 +++++++++++++ 5 files changed, 43 insertions(+) create mode 100644 common/spl/spl_optee.S diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 9d35f41..7e44da5 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -739,6 +739,13 @@ config SPL_ATF_NO_PLATFORM_PARAM If your ATF is affected, say Y. +config SPL_OPTEE + bool "Support OP-TEE Trusted OS" + depends on ARM + help + OP-TEE is an open source Trusted OS which is loaded by SPL. + More detail at: https://github.com/OP-TEE/optee_os + config TPL bool depends on SUPPORT_TPL diff --git a/common/spl/Makefile b/common/spl/Makefile index 9bf8a2d..9918a2e 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o obj-$(CONFIG_$(SPL_TPL_)NET_SUPPORT) += spl_net.o obj-$(CONFIG_$(SPL_TPL_)MMC_SUPPORT) += spl_mmc.o obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o +obj-$(CONFIG_$(SPL_TPL_)OPTEE) += spl_optee.o obj-$(CONFIG_$(SPL_TPL_)USB_SUPPORT) += spl_usb.o obj-$(CONFIG_$(SPL_TPL_)FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)EXT_SUPPORT) += spl_ext.o diff --git a/common/spl/spl.c b/common/spl/spl.c index 76c1963..97a98d6 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -436,6 +436,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_invoke_atf(&spl_image); break; #endif +#if CONFIG_IS_ENABLED(OPTEE) + case IH_OS_OP_TEE: + debug("Jumping to U-Boot via OP-TEE\n"); + spl_optee_entry(NULL, NULL, spl_image->fdt_addr, + (void *)spl_image.entry_point); + break; +#endif #ifdef CONFIG_SPL_OS_BOOT case IH_OS_LINUX: debug("Jumping to Linux\n"); @@ -450,6 +457,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2) debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr, gd->malloc_ptr / 1024); #endif + + debug("loaded - jumping to U-Boot...\n"); #ifdef CONFIG_BOOTSTAGE_STASH int ret; diff --git a/common/spl/spl_optee.S b/common/spl/spl_optee.S new file mode 100644 index 0000000..4f7f8ba --- /dev/null +++ b/common/spl/spl_optee.S @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2017 Rockchip Electronic Co.,Ltd + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include + +ENTRY(spl_optee_entry) + ldr lr, =CONFIG_SYS_TEXT_BASE + mov pc, r3 +ENDPROC(spl_optee_entry) diff --git a/include/spl.h b/include/spl.h index c14448b..adceb03 100644 --- a/include/spl.h +++ b/include/spl.h @@ -288,6 +288,19 @@ int spl_mmc_load_image(struct spl_image_info *spl_image, void spl_invoke_atf(struct spl_image_info *spl_image); /** + * spl_optee_entry - entry function for optee + * + * args defind in op-tee project + * https://github.com/OP-TEE/optee_os/ + * core/arch/arm/kernel/generic_entry_a32.S + * @arg0: pagestore + * @arg1: (ARMv7 standard bootarg #1) + * @arg2: device tree address, (ARMv7 standard bootarg #2) + * @arg3: non-secure entry address (ARMv7 bootarg #0) + */ +void spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3); + +/** * board_return_to_bootrom - allow for boards to continue with the boot ROM * * If a board (e.g. the Rockchip RK3368 boards) provide some From patchwork Thu Jan 4 07:07:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855427 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L42esDh1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzX34by9z9s74 for ; Thu, 4 Jan 2018 18:12:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 49FB1C21C4F; Thu, 4 Jan 2018 07:11:11 +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_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, 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 1A0ABC21DE7; Thu, 4 Jan 2018 07:10:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D778CC21C8F; Thu, 4 Jan 2018 07:09:11 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id E812BC21DC8 for ; Thu, 4 Jan 2018 07:09:06 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id d23so420618pfe.9 for ; Wed, 03 Jan 2018 23:09:06 -0800 (PST) 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; bh=KINuJ2tpNN4I/uTWhC6Hn+oTxYctV9MnSR2ALQq+RXw=; b=L42esDh1elPDcJ8vVx5hljE3XWsklanf4qEAcZzgLzUntItV/P+SWXZEJnMFuqoZCO e9+1/Ge8nCWhDxV4ux4WrJQm+1+KtaTmjznkPaPnvNbHwocjVfvzrYEA1EJ7SJ1d4hlG 3otxofKHwb80Bv6QL30OyaCdnyVMJWz5KBwk+dVIGFXDJyotbzRh4Kd8vDIgFayijZkQ 4qJczNdkm1vP7DXkEM72mo1iQ54ZpNDcmcwzEUAYiHLMXutStTs69AE+O0QdChWOAqFw iSzkWZ8536LyUUj6XPXPWJO1fap/Eb1XhtFJT2Pa9GxK2VLyW3KQ4PXMhuAgu6X67Z2B 9xjg== 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; bh=KINuJ2tpNN4I/uTWhC6Hn+oTxYctV9MnSR2ALQq+RXw=; b=En5PAoKPl7taCoGsAC3IxHHCz/wByJPgAuRcl1zzAi3XIo+agx8bjNwj3avdDwYIXu nRI08pz1dXV5pWi+4Wwl0ksCy2qm12twq2nZsVsqAGdEa4h2exMUJRWCKvszoo4eifQW c9rS5cfjxMQ/lMsuPf/zvd5enBA+gzF/g9VKcybEgWpt0INNS4YKEY38sGCxG6V/z0RB G4iv+q8SA57oiCnFP57jurQ2FYJK6w0U7Ts7JsCTqKodOtLSCUcajNfbsGHhZsdZspJF Ux1Br/p/u9/3fCC26TIDOijzgTIa7vGewnAx0rmang1swvd6YLUjyby0tT6iGEefB26S kkKQ== X-Gm-Message-State: AKGB3mLYX3QcIPOniBhGuEN2AEeByub/XOd4gBADutixUyzgRSJ9B4fi orzb3QcTUBlWx4F/LohJSusS/Q== X-Google-Smtp-Source: ACJfBotaz9muHX0YwcSj9Stk6Kr8VI5UXh9jC6XJgzxdv9mrph8LNrLR8rfBZzUlk0X8sYKo8wGi4w== X-Received: by 10.101.87.201 with SMTP id q9mr3329662pgr.349.1515049745377; Wed, 03 Jan 2018 23:09:05 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.09.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:09:04 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:07 +0800 Message-Id: <1515049636-13513-9-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: 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 ae0b0a4..fe4abe9 100644 --- a/arch/arm/dts/rk3229-evb.dts +++ b/arch/arm/dts/rk3229-evb.dts @@ -83,6 +83,7 @@ }; &uart2 { + u-boot,dm-pre-reloc; status = "okay"; }; From patchwork Thu Jan 4 07:07:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855426 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MJQm2Trl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzWm4mzkz9s74 for ; Thu, 4 Jan 2018 18:12:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 538E1C21DDE; Thu, 4 Jan 2018 07:10: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_DNSWL_BLOCKED, 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 BA4BCC21DE4; Thu, 4 Jan 2018 07:10:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AB6D4C21DB2; Thu, 4 Jan 2018 07:09:13 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 68524C21DB5 for ; Thu, 4 Jan 2018 07:09:09 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id b70so390042pga.2 for ; Wed, 03 Jan 2018 23:09:09 -0800 (PST) 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; bh=oRAv8WGwk9nRs9Jz+bHfuwibENfV0GhCSGzknSQjn4k=; b=MJQm2TrlU6R7HpFvCCUptORXykEUZebGbUYwBQM3AdmF6dYFuebiaKb2ilNfxwRCfO CZ1+YMR8WRqaIutpsHIP8Jst9h+mPhmFveZv/BWjtQj5+w7OkEpaqOE0za7t127aWBNX VaHDzWIMKaYfPzV3o+6VmFJwkaBFXN+rWorfNMtGUn0ELSSeSgIW8xaeJOzTBsy0waWa CmcobJS6kn/tG3B2cbKCSruBRV1pStU5vneOgbtPo5dafTk/z1e2z08xEzO2yPiPt9Jk vsXXyTHihj8KOoJtpPV5yjO15yvrL+y3irb9gCbYWhQJTsMa/M5ekA255jKz2Jx/krkz lpnQ== 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; bh=oRAv8WGwk9nRs9Jz+bHfuwibENfV0GhCSGzknSQjn4k=; b=U02PQypjWMPZDSRjjyuwVmMfrKywyhrxdGauzyyaHNPDJf71YfURDVj1Egs5WpkWv1 YN29q34gHDbq6bcCR0gF8yd8sq6nKB5PaLATIVs1qvYGPvyTZv/ZAo2h8UA80ztWxTBv 6O9oOR1vzuOdyAijAvwN6scesjlrCmic8M9ExMuWl02Ys8d9HwtfDgdIEesjhy+PtqZt XrmUluIezK9R2MEWKIF2QIPV94EBC4I6ByQCx8SJcxEuud0Xex6ivUMKgawjyHdVxLre HnXUe7z32OQmdLSIsYK6YAi5JW+6av/BA0KIRPck/WxHpNPiq2t586cFqFpXWWniBj9p 5YWA== X-Gm-Message-State: AKGB3mK8e56NvFq6UGjIa0A0f18oIgbiSq3j/uqwyb5Y+FFgtbRBxGQD 7dGIiLxaE+FX8YA+3QQ+yI5nGw== X-Google-Smtp-Source: ACJfBouCrgIuBL9eb6xRz3XpiB0hf5SbxhQhrVoJvxjoCAWDrNX+qijBN2H5emaiJsZaEOeFeBC8Dg== X-Received: by 10.99.95.135 with SMTP id t129mr3267064pgb.161.1515049747805; Wed, 03 Jan 2018 23:09:07 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.09.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:09:06 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:08 +0800 Message-Id: <1515049636-13513-10-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 09/11] rockchip: add fit source file for pack itb with op-tee 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" We package U-Boot and OP-TEE into one itb file for SPL, so that we can support OP-TEE in SPL. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: - Make the its as common file used for all armv7 with op-tee arch/arm/mach-rockchip/fit_spl_optee.its | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 arch/arm/mach-rockchip/fit_spl_optee.its diff --git a/arch/arm/mach-rockchip/fit_spl_optee.its b/arch/arm/mach-rockchip/fit_spl_optee.its new file mode 100644 index 0000000..3aeecb8 --- /dev/null +++ b/arch/arm/mach-rockchip/fit_spl_optee.its @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Rockchip Electronic Co.,Ltd + * + * Simple U-boot fit source file containing U-Boot, dtb and optee + */ + +/dts-v1/; + +/ { + description = "Simple image with OP-TEE support"; + #address-cells = <1>; + + images { + uboot@1 { + description = "U-Boot"; + data = /incbin/("../../../u-boot-nodtb.bin"); + type = "standalone"; + os = "U-Boot"; + arch = "arm"; + compression = "none"; + load = <0x61000000>; + }; + optee@1 { + description = "OP-TEE"; + data = /incbin/("../../../tee.bin"); + type = "firmware"; + arch = "arm"; + os = "op-tee"; + compression = "none"; + load = <0x68400000>; + entry = <0x68400000>; + }; + fdt@1 { + description = "dtb"; + data = /incbin/("../../../u-boot.dtb"); + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "conf@1"; + conf@1 { + description = "Rockchip armv7 with OP-TEE"; + firmware = "optee@1"; + loadables = "uboot@1"; + fdt = "fdt@1"; + }; + }; +}; From patchwork Thu Jan 4 07:07:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855428 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kGEagFcx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzXP070Nz9s74 for ; Thu, 4 Jan 2018 18:12:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AEC09C21DA5; Thu, 4 Jan 2018 07:10:30 +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_DNSWL_BLOCKED, 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 D76A0C21DF3; Thu, 4 Jan 2018 07:10:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1C569C21DDB; Thu, 4 Jan 2018 07:09:13 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id C2209C21DC8 for ; Thu, 4 Jan 2018 07:09:11 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id g2so578920pli.8 for ; Wed, 03 Jan 2018 23:09:11 -0800 (PST) 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; bh=NRfIRBvCGnZVxE3RYH0zv7wy3endyga93MvHW/omADQ=; b=kGEagFcxCaCNnGkZdf75RCeqEsFsVJWV4rmEUzi22PDIE74c7bIe1lW+hxqUWi/q5H NCUWeC6FatHvUjMnhF25EWRpsgK05Tx7kXhdTAzsG40BXMOKdTfbHbOMhQ9Yv5SmQU5F 6JDvNFzep4rtRNXW39KBA2g/J/LLDHCTgn7JkAcNxvYKOc3Lw7QuC5gbkRx4hKoiLuLg U3eKU+QnPKzcOMP8PuOc+XkmG6yQ4hOVroiHPNzeJQe0LJtIYWEeBgj2BkaxZVrBeO26 hn1cWY2gS1mN/84pbv1qohEMw8FREo+kdPbB3WunX5vO+GDhDZfCaE4VIcpl6bthIxJ1 mtkQ== 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; bh=NRfIRBvCGnZVxE3RYH0zv7wy3endyga93MvHW/omADQ=; b=VkdN9VxCBAZ29z8X1FZ8Ya1OcuGY1H2AAWoU2pxmtsBjyUB7o6Fw6WKXQdG2L26c6l xvcszyM+fz3Zlzuej5sw8M2dwgGYwkyJKVdEHnPbAjRRUVdAVHc03vSIAybK6pEjvNn4 G162tEGFXRbz17cypdPh3Glf8nDn/zAmheRLxDzJidSmlUb8B4/rzUhfxxpi3Y91J6Zz 59l0+xtDlTZehNyCOFqyYiZYYcKejeE1rzlcvPTjMOe0mhL/Wt+d4vndAbmMxEnPP55k iX/eFO+ySeztfLTl+YYYxAGavDkF4HptKoeTmq9U69ZQUrVWBAbdRbQEga1pqlXJ1z/a UWBQ== X-Gm-Message-State: AKGB3mL+G85gZcwYLXdnZ3lK9bgak3YNaViPXaRUCkC6qMN3HyxJqEK/ LexgG3XxxKsuwd+lYNArl7swLw== X-Google-Smtp-Source: ACJfBouVs9/CmuSbWX/KFidMhnt3k1a/3gARbEPTh1ZcgRiQ40U6AyhOZWaOwdJ0shtAd6U7gTIo0A== X-Received: by 10.84.210.66 with SMTP id z60mr3784480plh.359.1515049750184; Wed, 03 Jan 2018 23:09:10 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.09.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:09:09 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:09 +0800 Message-Id: <1515049636-13513-11-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: 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 0000000..46c54c2 --- /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 ../rkdeveloptool + > 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 Thu Jan 4 07:07:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 855432 X-Patchwork-Delegate: philipp.tomsich@theobroma-systems.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G+Q/LsIV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zBzZ15FY8z9s74 for ; Thu, 4 Jan 2018 18:14:17 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 53E66C21DBB; Thu, 4 Jan 2018 07:11:45 +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=RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 7A8BDC21DCE; Thu, 4 Jan 2018 07:10:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DEA99C21DCE; Thu, 4 Jan 2018 07:09:14 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id 13F34C21DE8 for ; Thu, 4 Jan 2018 07:09:14 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id 1so591233plv.0 for ; Wed, 03 Jan 2018 23:09:14 -0800 (PST) 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; bh=C14J2qJzdx+s+zByoOOT3S5MwC6OQvbeqe7C6dHwUdA=; b=G+Q/LsIVStroupkioYVd6uYs9wnR1FdFbvQKPlYGfoRJ8o9LwBzgtRD4tyeyFID3W+ aLcyAXR0IvWoK/kqWItymWilu2bENuV8gupSDUOOgPBHibdvKIjFFpETE34KEsDMqLth 7ajNz7z3a1v6D5RVEWb5TIoGi0OlPGr8rhs9kEGvTAogGsNG4CcuMyiTC81R2W18PSh5 INXHj6GqjT9YS0jtFnlmgviZdGIgMYnPHvpE1S7/dYg+j3UiZ6S4rABXu1d1HB/3yfxs afhdibIpTnqYbU1K8H7nkVPoeoD08hvT7RkMEV4MPH/onHHrueg1wIwKJNQjDUgOAxhj kmsg== 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; bh=C14J2qJzdx+s+zByoOOT3S5MwC6OQvbeqe7C6dHwUdA=; b=hn7kJUfPC1b1UO+WjpCKTU1g3UQhXeHGRu4HYG8ejQFpgq51w3Gk0WE5WgyunFzWvT 7OjPeSMMI9HfdCc7WBupDOEVqRudvmRpgBNfCjM9gmJ3DFxCUIpbcNB3Lfi62pZzaDil l3f1QkDRCJmIw5kj5aAnwVFG45XnkDyIrzlYlkucPFLsWlf2vPmB7zJiXXFZM0qBt5+3 Vt0vV2/nwdrn/GDd3CR4wf75KGz3MSVJsn5Yh6gNJAeX6BvAs+IjLnAjYwzEAapSlxBP tpUgwhROx89l59/TkuctHEdS1ihYSTCbYjVpCwVBL936W4RXJaUsFbp9KROH8bkkgDeA NGfA== X-Gm-Message-State: AKGB3mJl3RKoNBK8UiigdaCdLtePHOf0ezzSlnyYHNhR63EoLAa9zmGk OCVLT/iTPkpbvidacqOoYqV54w== X-Google-Smtp-Source: ACJfBouHZ8wjFj33ZcF87+atemNAW/CAcqUyVkT1LT15MU5f5DshPj3eBiOFdFcW6zAShT77GwZjbg== X-Received: by 10.159.247.15 with SMTP id d15mr3712197pls.88.1515049752524; Wed, 03 Jan 2018 23:09:12 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id c8sm5716787pfm.92.2018.01.03.23.09.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 23:09:11 -0800 (PST) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 4 Jan 2018 15:07:10 +0800 Message-Id: <1515049636-13513-12-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> References: <1515049636-13513-1-git-send-email-kever.yang@rock-chips.com> Subject: [U-Boot] [PATCH v4 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: , MIME-Version: 1.0 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 Acked-by: Philipp Tomsich Reviewed-by: Philipp Tomsich --- Changes in v4: None Changes in v3: None Changes in v2: - update defconfig option configs/evb-rk3229_defconfig | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig index b226f66..025822d 100644 --- a/configs/evb-rk3229_defconfig +++ b/configs/evb-rk3229_defconfig @@ -4,14 +4,27 @@ 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_LDSCRIPT="arch/arm/mach-rockchip/rk322x/u-boot-tpl.lds" +CONFIG_TPL_TEXT_BASE=0x10081000 +CONFIG_TPL_MAX_SIZE=28672 +CONFIG_TPL_STACK=0x10088000 +CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x0 CONFIG_TARGET_EVB_RK3229=y -CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_SPL_STACK_R_ADDR=0x60600000 CONFIG_DEFAULT_DEVICE_TREE="rk3229-evb" CONFIG_DEBUG_UART=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_SOURCE="arch/arm/mach-rockchip/fit_spl_optee.its" # CONFIG_DISPLAY_CPUINFO is not set +# 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_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x4000 +CONFIG_SPL_OPTEE=y CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_CMD_GPT=y @@ -19,14 +32,19 @@ 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_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_TPL_DM=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_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -35,12 +53,14 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_ROCKCHIP_RK322X=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_BASE=0x11030000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Rockchip"