From patchwork Thu Sep 7 07:00:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 810863 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="NuvTXHH6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xnrv54Q0Vz9sNd for ; Thu, 7 Sep 2017 17:00:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BE556C21E09; Thu, 7 Sep 2017 07:00:26 +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_NONE, 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 5969BC21C72; Thu, 7 Sep 2017 07:00:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4B7D4C21C40; Thu, 7 Sep 2017 07:00:23 +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 805F7C21C6D for ; Thu, 7 Sep 2017 07:00:22 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a2so4127238pfj.4 for ; Thu, 07 Sep 2017 00:00:22 -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; bh=zmCnDPVX1Uexm87V7t7zABJnRGwo18DlP1peM2AGu6U=; b=NuvTXHH6QFymzCTuNdwFtJ4GXq1di7BsVzhaR6ntNZRweCb92s7BUnW9RAeUPsn3zz y6/3JH6lU3JWyoyts/Gb3n4qrK/XOarMOA33gjvx0Okbuh7FNsn0MwhYXG3OsdsdccnL gzAkJ5mhZkh2cfQPTJeW+LukRktDLYQlJXcFfLYO2m3Y6c4ud6yOSqRpo9IFLyHTNV2/ El6Td4FMX3st2bdfGg+dCNTrJo+LrYj/aXsG1GhCXoYz+zHWsR2hHgX2kkxQoXNVNWJ2 qsXTT849GuPKbbiTus3GGpBcc1GbzspdV/kDMO0JhDpMD6zVMwxdn5sNpaJHDLp5rEDT irDw== 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; bh=zmCnDPVX1Uexm87V7t7zABJnRGwo18DlP1peM2AGu6U=; b=fhc27NT9lw3JxnbkdpB5hyAzrd9EYNh64t1DRqNBBA+UbwIuKUMsNjuGIajfoVQSj3 GU/pE2DffAtGdrG86jqFDLDClhq9ea40KgPIxzwS0Tx8v6W2rc1TDHiDMakJT0uhK67M uS3qigxuZJvcjtnt45VV8u1++I/hvKBcgC5PgrQB7dfBte70yql/j1vgNydL7QZLZbdG 63LklbQp54OYk4nGkF+UMtkPa2AbFYx0crVrn3tJB2rPQxZjLt6zm+DI4ab+yEOSI/Dd gBFLST+7ZVxDy8hT2XbBsCr2rsFcvJUgFbdBZLkSBWawoI46s9ILnVJYD+JLqo0GiK0B wZgg== X-Gm-Message-State: AHPjjUiRGze9z6j+AtLyMiBoYHOD74xgwJo+d96Q11i3INen4rRbslJn NS1KoOaO1aO1vMH8 X-Google-Smtp-Source: ADKCNb5aw2Wpew6Y4uj2FWgjJeQD97iZuSNx7/IdL1x39n64KETY/JyCIJtuT4usg6MZVQW1j2FOLQ== X-Received: by 10.84.131.109 with SMTP id 100mr1941082pld.122.1504767620932; Thu, 07 Sep 2017 00:00:20 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 5sm2197466pfr.151.2017.09.07.00.00.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 00:00:19 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 7 Sep 2017 15:00:00 +0800 Message-Id: <1504767608-8846-1-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 Cc: Stefan Agner Subject: [U-Boot] [PATCH 1/3] spl: update bl31_entry() with new name and parameter 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" Rename the bl31_entry() function with 'spl_' prefix and add one parameter for bl31 entry address since we can get it from spl_image header. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich --- common/spl/spl.c | 2 +- common/spl/spl_atf.c | 4 ++-- include/spl.h | 6 +++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index 6ff390c..1d8bbb2 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -427,7 +427,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) if (CONFIG_IS_ENABLED(ATF_SUPPORT)) { debug("loaded - jumping to U-Boot via ATF BL31.\n"); - bl31_entry(); + spl_bl31_entry((void *)spl_image.entry_point); } if (CONFIG_IS_ENABLED(OPTEE_SUPPORT)) { diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 6e8f928..2f6fff9 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -82,13 +82,13 @@ void raw_write_daif(unsigned int daif) __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); } -void bl31_entry(void) +void spl_bl31_entry(void *entry_addr) { struct bl31_params *bl31_params; void (*entry)(struct bl31_params *params, void *plat_params) = NULL; bl31_params = bl2_plat_get_bl31_params(); - entry = (void *)CONFIG_SPL_ATF_TEXT_BASE; + entry = entry_addr; raw_write_daif(SPSR_EXCEPTION_MASK); dcache_disable(); diff --git a/include/spl.h b/include/spl.h index 13d46ed..d21a3d2 100644 --- a/include/spl.h +++ b/include/spl.h @@ -267,7 +267,11 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr); int spl_mmc_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev); -void bl31_entry(void); +/** + * spl_bl31_entry - entry function for ATF bl31 + * @entry_addr - entry address of bl31 text + */ +void spl_bl31_entry(void *entry_addr); /** * spl_optee_entry - entry function for optee From patchwork Thu Sep 7 07:00:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 810864 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="i/KAzruR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xnrvz3dqCz9sCZ for ; Thu, 7 Sep 2017 17:01:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 32AA6C21DE6; Thu, 7 Sep 2017 07:00:44 +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_NONE, 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 557E1C21E35; Thu, 7 Sep 2017 07:00:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CC00AC21E2D; Thu, 7 Sep 2017 07:00:32 +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 A5CD5C21E18 for ; Thu, 7 Sep 2017 07:00:27 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a2so4127378pfj.4 for ; Thu, 07 Sep 2017 00:00:27 -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; bh=EM46PL4P9sNMRMQCRNFduaAiXBT+ORV3Qhme3sJWaNU=; b=i/KAzruR4pjJQQKQIRD8ccszbCM1ezvBhfo00fZkIP5FV9MAjKAhCG+7TJrGqacQmG nj1j3RMsD579B0EcRh3nzVn9X/e1wlR7Iz9KrwaLmtmR2or/a34C7yFPydMAC0xxsFW6 3Si5h/E8zwulU5U+/eRKG4nzT6rkN12oYbrHb91HDsChRlioIiNaFa31ngHDOZGdyhYZ KzEqAOyhQ7uMYLXgj44rPRRZCvqZvWEeU3yDvJ7B7u9bEltrHsvcKDPlbj2aI/JGnJNy NgYUZIommUUM1ZYReNNh0yCRbmYIjxsMq5pDOETPZ3KvkTHY8lXws2z56PHFb6MeS6ek yxnQ== 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=EM46PL4P9sNMRMQCRNFduaAiXBT+ORV3Qhme3sJWaNU=; b=U7IxOD3hAx2Vo9uKblyVgCUf8j4LlkmXqxOOfV4J2BoFU+MUJwatCA63keBl0ff3mF NyfBOGseEEPSyXqrtDArYI3yDMdwPDSHgFfsf+jG/nKokZUMGHZzu4M6S2kcgX/UgRPj km4TOpRgwfDHJgI5xx2G4NASPExCDfgYK6llLD+fU43mTBHwPG3LaSekQD0xOZ02rfYr K1OZAd9lDwgyJPEsNeAVdsgITIGI3ZaRJnqWd6bkZ8cLeP0E1belkulBeYksfq3elSbX xd1ifyH3V3OmrwAt/N2pomoKD5cC5jldDE9+E653dB7oqkzdqlV8sEtQQAOGmZdgm6VT csiA== X-Gm-Message-State: AHPjjUjWsAI/TSMsSqFYGWt9RL2wflGlKBvJdgcNOIVmyl2LFBs34nBt 14y451EN5iu+Is0n X-Google-Smtp-Source: ADKCNb7KHgNz3yU5ig0P+MgJ9zSqq3qQ4D0X4UyBnAaSTflqjIPptHOGovyzjOa+DrxObmMy1lIzcw== X-Received: by 10.84.132.34 with SMTP id 31mr1862575ple.225.1504767626271; Thu, 07 Sep 2017 00:00:26 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 5sm2197466pfr.151.2017.09.07.00.00.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 00:00:25 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 7 Sep 2017 15:00:01 +0800 Message-Id: <1504767608-8846-2-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504767608-8846-1-git-send-email-kever.yang@rock-chips.com> References: <1504767608-8846-1-git-send-email-kever.yang@rock-chips.com> Cc: Stefan Agner Subject: [U-Boot] [PATCH 2/3] spl: remove SPL_ATF_TEXT_BASE config option 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 don't need SPL_ATF_TEXT_BASE since we can get the bl31 entry from spl_image.entry_point. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich --- common/spl/Kconfig | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 85f8d66..3a74ca3 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -694,12 +694,6 @@ config SPL_ATF_SUPPORT is loaded by SPL(which is considered as BL2 in ATF terminology). More detail at: https://github.com/ARM-software/arm-trusted-firmware -config SPL_ATF_TEXT_BASE - depends on SPL_ATF_SUPPORT - hex "ATF BL31 base address" - help - This is the base address in memory for ATF BL31 text and entry point. - config SPL_OPTEE_SUPPORT bool "Support OP-TEE Trusted OS" depends on ARM From patchwork Thu Sep 7 07:00:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 810865 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="e9KDNcli"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xnrwT6zx4z9sCZ for ; Thu, 7 Sep 2017 17:01:45 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A4D15C21E42; Thu, 7 Sep 2017 07:01: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_DNSWL_NONE, 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 4C0CDC21E2C; Thu, 7 Sep 2017 07:00:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 70792C21DB8; Thu, 7 Sep 2017 07:00:34 +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 0CFE0C21E27 for ; Thu, 7 Sep 2017 07:00:30 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id t3so4574229pgt.5 for ; Thu, 07 Sep 2017 00:00:29 -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; bh=LuMFPX5XC0JRtxun1U1PwMfGEAUXjIKAgxARp9CR9W4=; b=e9KDNclipW5+Fr46jdZ8+yortlL/AiVyan9GuyGD5WFphviFT6y+3yns2wS/kpmam1 o3lOB2Hm6y5PrCQM6oZ/TLDKi8ejj8AZEw9Arou58O86vmpmbdWlUmTVAY1m32ri19aQ +LJE9LgrAC2+XBGr8YnLOtqfjiQUvTQdzDKyr9osdB+Q9tDsIhGvsuDuKeeyW8QUkfjI taprqcjjiwXvIbQ3nwmWckrQQ77T4C2ItsC4ykEPUQrvWmYIV4KTXDVubpp9+qAgu1ae oUdI+GJaVSj4pXX2FhZ++ePEOvmz7U2iPowX5CofnJABKlTOBw8s5BsUTuV9YiZFKrSP 07kA== 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=LuMFPX5XC0JRtxun1U1PwMfGEAUXjIKAgxARp9CR9W4=; b=RrtgMHOB9aJFA/mLHjbXZch7PuiT+Z8a6OIBADnyj67jUNc9ARWKNDr39CMOg/VuvA hD+kFus6ObnS4HI0SEkRQLCQun4t+8WnjvGzBWDS+nEyIzDIroQJQrJbhPCse6REazB0 LGnI3Hz66N52yc0LUuc3vZYsTAXhOfr8Dlp0RqpQj+hlgAp7pI2qiaeGrqsINWY+jgVp njy0AQujRlH//CtluVa57g5zcrSzB8iqB5v8A+O7SsAus84HldjgAJOBol+LRFY9+YmX O6NK9alM81ufRzzD9sWFrJP7wr5bpuZ3jddfhKspot/MxWGz0IyROyVnvNOvYqaYs1fL zIHQ== X-Gm-Message-State: AHPjjUhON0wv+qDq8Cy1U30N7ba/IGUF7s3/aHzaXjdprzlxS7uO6UTP 3Wcs6Y+nrXDHHwXe X-Google-Smtp-Source: ADKCNb6YDY7YjPS3Ob57pDxc3Fmx8rC5q/EY7Dnv51Odj+ntdlZc7glY7huFptkYEOGzc0lwW7zvRg== X-Received: by 10.101.72.65 with SMTP id i1mr1789743pgs.184.1504767628592; Thu, 07 Sep 2017 00:00:28 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id 5sm2197466pfr.151.2017.09.07.00.00.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 00:00:28 -0700 (PDT) From: Kever Yang To: u-boot@lists.denx.de Date: Thu, 7 Sep 2017 15:00:02 +0800 Message-Id: <1504767608-8846-3-git-send-email-kever.yang@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504767608-8846-1-git-send-email-kever.yang@rock-chips.com> References: <1504767608-8846-1-git-send-email-kever.yang@rock-chips.com> Cc: Klaus Goger Subject: [U-Boot] [PATCH 3/3] rockchip: remove CONFIG_SPL_ATF_TEXT_BASE for all boards 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" After update bl31_entry(), we don't need CONFIG_SPL_ATF_TEXT_BASE. Signed-off-by: Kever Yang Acked-by: Philipp Tomsich --- configs/firefly-rk3399_defconfig | 1 - configs/lion-rk3368_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index eead166..d9dc887 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -15,7 +15,6 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_ATF_SUPPORT=y -CONFIG_SPL_ATF_TEXT_BASE=0x00010000 CONFIG_FASTBOOT=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_CMD_FASTBOOT=y diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 73547f8..9735f17 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -29,7 +29,6 @@ CONFIG_TPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_ATF_SUPPORT=y -CONFIG_SPL_ATF_TEXT_BASE=0x10000 CONFIG_TPL=y CONFIG_TPL_BOOTROM_SUPPORT=y CONFIG_TPL_DRIVERS_MISC_SUPPORT=y