From patchwork Fri Jan 4 00:37:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020555 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5VZ452Jz9s7h for ; Fri, 4 Jan 2019 11:38:14 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2E605C21C4A; Fri, 4 Jan 2019 00:38:04 +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=none 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 2C06DC21C8B; Fri, 4 Jan 2019 00:38:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 64FFEC21C4A; Fri, 4 Jan 2019 00:38:00 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id 07BDAC21C50 for ; Fri, 4 Jan 2019 00:38:00 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EPAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBVAEBAQEBAQsBggOBVjmMb4sdixSQKQ2EbAKDbiI3Bg0BAwEBAgEBAgICaRwMhT4GJwsBRhBRIRwaBg4FgyGBagMUAahJM4d2DYIZCQGHUIQrgVc/hnmBcYEEhQ4CiQqBfpQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFcI4FVMxokgzuCJxeDQ4paPgEyAYwOgk0BAQ X-IPAS-Result: A2EPAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBVAEBAQEBAQsBggOBVjmMb4sdixSQKQ2EbAKDbiI3Bg0BAwEBAgEBAgICaRwMhT4GJwsBRhBRIRwaBg4FgyGBagMUAahJM4d2DYIZCQGHUIQrgVc/hnmBcYEEhQ4CiQqBfpQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFcI4FVMxokgzuCJxeDQ4paPgEyAYwOgk0BAQ X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609576" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:37:58 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0ATAACO3/Jb/xBhWMBiGgEBAQEBAgEBAQEHAgEBAQGBVAIBAQEBCwGDOCE5jG+WMZApDYRsAoQPNwYNAQMBAQIBAQJtHAyFPQYnCwFGEFEhHBoGDgWDIYFqAxWoQzOHdg2CGQkBh1CGAj+GeYFxgQSFDgKJCoF+lDkuBwKBEYEJBItegyALGIlYhyWOQYlVgVwigVUzGiSDO4InF4NDilo+AzABjA6CTQEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618098" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:37:59 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:37:59 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:28 +0100 Message-ID: <20190104003734.28052-2-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--3.444800-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 1/7] riscv: clarify error message on undefined exceptions 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" Undefined exceptions are treated as reserved. This is not clearly communicated to the user. Adjust the error message to clarify that a reserved exception has occurred and add additional details. Fixes: e8b522b ("riscv: treat undefined exception codes as reserved") Signed-off-by: Lukas Auer Reviewed-by: Bin Meng --- Changes in v2: None arch/riscv/lib/interrupts.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/riscv/lib/interrupts.c b/arch/riscv/lib/interrupts.c index e185933b01..74c1e561c7 100644 --- a/arch/riscv/lib/interrupts.c +++ b/arch/riscv/lib/interrupts.c @@ -37,7 +37,8 @@ static void _exit_trap(ulong code, ulong epc, struct pt_regs *regs) printf("exception code: %ld , %s , epc %lx , ra %lx\n", code, exception_code[code], epc, regs->ra); } else { - printf("Reserved\n"); + printf("reserved exception code: %ld , epc %lx , ra %lx\n", + code, epc, regs->ra); } hang(); From patchwork Fri Jan 4 00:37:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020558 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5Yn1g4Yz9s7T for ; Fri, 4 Jan 2019 11:41:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E27A0C21C50; Fri, 4 Jan 2019 00:38:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none 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 D54F9C21DD9; Fri, 4 Jan 2019 00:38:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3116DC21C50; Fri, 4 Jan 2019 00:38:01 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id D6794C21C2C for ; Fri, 4 Jan 2019 00:38:00 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHZRMhnENhGwCg24iOBIBAwEBAgEBAgICaSiFPgYyAUYQUT0aBg4FgyGCAQGofIocCQGHUIQrgVc/gRABiF2FDgKLCJRnBwKBEYEJBI5+CxiJWIclLJdqgV0igVUzGiSDO4InF44dPgEyAY5bAQE X-IPAS-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHZRMhnENhGwCg24iOBIBAwEBAgEBAgICaSiFPgYyAUYQUT0aBg4FgyGCAQGofIocCQGHUIQrgVc/gRABiF2FDgKLCJRnBwKBEYEJBI5+CxiJWIclLJdqgV0igVUzGiSDO4InF44dPgEyAY5bAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609577" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:37:59 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkAACO3/Jb/xBhWMBiGwEBAQEDAQEBBwMBAQGBZYM5ITmMb59phnENhGwChA84EgEDAQECAQECbSiFPQYyAUYQUT0aBg4FgyGCAqh2ihwJAYdQhgI/gRABiF2FDgKLCJRnBwKBEYEJBI5+CxiJWIclLJdqgV0hgVUzGiSDO4InF44dPgMwAY5bAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618101" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:00 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:00 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:29 +0100 Message-ID: <20190104003734.28052-3-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--3.857700-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 2/7] riscv: move the AX25-specific implementation of flush_dcache_all 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" The fence instruction is used to enforce device I/O and memory ordering constraints in RISC-V. It can not be relied on to directly affect the data cache on every CPU. Andes' AX25 does not have a coherence agent. Its fence instruction flushes the data cache and is used to keep data in the system coherent. The implementation of flush_dcache_all in lib/cache.c is therefore specific to the AX25. Move it into the AX25-specific cache.c in cpu/ax25/. This also adds a missing new line between flush_dcache_all and flush_dcache_range in lib/cache.c. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Reviewed-by: Rick Chen --- Changes in v2: - Replace patch "riscv: remove invalid dcache flush implementation" with new patch "riscv: move the AX25-specific implementation of flush_dcache_all" arch/riscv/cpu/ax25/cache.c | 22 ++++++++++++++++++++++ arch/riscv/lib/cache.c | 10 ++++------ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/arch/riscv/cpu/ax25/cache.c b/arch/riscv/cpu/ax25/cache.c index 8d6ae170b8..228fc55f56 100644 --- a/arch/riscv/cpu/ax25/cache.c +++ b/arch/riscv/cpu/ax25/cache.c @@ -6,6 +6,28 @@ #include +void flush_dcache_all(void) +{ + /* + * Andes' AX25 does not have a coherence agent. U-Boot must use data + * cache flush and invalidate functions to keep data in the system + * coherent. + * The implementation of the fence instruction in the AX25 flushes the + * data cache and is used for this purpose. + */ + asm volatile ("fence" ::: "memory"); +} + +void flush_dcache_range(unsigned long start, unsigned long end) +{ + flush_dcache_all(); +} + +void invalidate_dcache_range(unsigned long start, unsigned long end) +{ + flush_dcache_all(); +} + void icache_enable(void) { #ifndef CONFIG_SYS_ICACHE_OFF diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index ae5c60716f..78b19da2c5 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -11,13 +11,12 @@ void invalidate_icache_all(void) asm volatile ("fence.i" ::: "memory"); } -void flush_dcache_all(void) +__weak void flush_dcache_all(void) { - asm volatile ("fence" :::"memory"); } -void flush_dcache_range(unsigned long start, unsigned long end) + +__weak void flush_dcache_range(unsigned long start, unsigned long end) { - flush_dcache_all(); } void invalidate_icache_range(unsigned long start, unsigned long end) @@ -29,9 +28,8 @@ void invalidate_icache_range(unsigned long start, unsigned long end) invalidate_icache_all(); } -void invalidate_dcache_range(unsigned long start, unsigned long end) +__weak void invalidate_dcache_range(unsigned long start, unsigned long end) { - flush_dcache_all(); } void cache_flush(void) From patchwork Fri Jan 4 00:37:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020559 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5Yx1WVmz9s7T for ; Fri, 4 Jan 2019 11:41:09 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CBD3FC21DB6; Fri, 4 Jan 2019 00:38: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=none 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 BCECDC21DF9; Fri, 4 Jan 2019 00:38:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3C2CAC21C93; Fri, 4 Jan 2019 00:38:02 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id DD904C21C2C for ; Fri, 4 Jan 2019 00:38:01 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2GtAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZQKCAoFWOYxvix2bPQ2EbAKDbiI4EgEDAQECAQECAgJpKEIWAYRlBjIBRhBRPRoGDgWDIYIBAah8ihwJAYdQhCuBVz+JboUOAosIlGcHAoERgQkEjn4LGIlYhyUsl2qBXSKBVTMaJIM7gicXjh0+ATIBi3GCagEB X-IPAS-Result: A2GtAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZQKCAoFWOYxvix2bPQ2EbAKDbiI4EgEDAQECAQECAgJpKEIWAYRlBjIBRhBRPRoGDgWDIYIBAah8ihwJAYdQhCuBVz+JboUOAosIlGcHAoERgQkEjn4LGIlYhyUsl2qBXSKBVTMaJIM7gicXjh0+ATIBi3GCagEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609578" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:00 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkAACO3/Jb/xBhWMBiGwEBAQEDAQEBBwMBAQGBZYM5ITmMb6ZaDYRsAoQPOBIBAwEBAgEBAm0ohT0GMgFGEFE9GgYOBYMhggKodoocCQGHUIYCP4luhQ4CiwiUZwcCgRGBCQSOfgsYiViHJSyXaoFdIYFVMxokgzuCJxeOHT4DMAGOWwEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618102" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:01 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:01 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:30 +0100 Message-ID: <20190104003734.28052-4-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No-1.057900-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 3/7] riscv: use invalidate/flush_*cache_range functions in cache.c 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" The flush_cache() function in lib/cache.c ignores its arguments and flushes the complete data and instruction caches. Use the invalidate/flush_*cache_range() functions instead to only flush the requested memory region. This patch does not change the current behavior of U-Boot, since the implementation of the invalidate/flush_*cache_range() functions flush the complete data and instruction caches. It is in preparation for CPUs with the necessary functionality for flushing a selectable memory range. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Reviewed-by: Rick Chen --- Changes in v2: - New patch "riscv: use invalidate/flush_*cache_range functions in cache.c" arch/riscv/lib/cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/lib/cache.c b/arch/riscv/lib/cache.c index 78b19da2c5..5437a122a1 100644 --- a/arch/riscv/lib/cache.c +++ b/arch/riscv/lib/cache.c @@ -40,8 +40,8 @@ void cache_flush(void) void flush_cache(unsigned long addr, unsigned long size) { - invalidate_icache_all(); - flush_dcache_all(); + invalidate_icache_range(addr, addr + size); + flush_dcache_range(addr, addr + size); } __weak void icache_enable(void) From patchwork Fri Jan 4 00:37:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020563 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5c80v4zz9s7T for ; Fri, 4 Jan 2019 11:43:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BBF90C21D74; Fri, 4 Jan 2019 00:40: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=none 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 5FA77C21DD4; Fri, 4 Jan 2019 00:38:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CBFCBC21DFA; Fri, 4 Jan 2019 00:38:07 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id C9FD0C21DD4 for ; Fri, 4 Jan 2019 00:38:03 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EaAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBVAEBAQEBAQsBggNmcDmHQoUtix2EOoZahSyJF4FmDR+BEYM8AoNuIjcGDQEDAQECAQECAgJpHAyEIV8+BjIBRhBRIRwaBg4FgyEBgWkDFAGofINxhAUNghkJAYdQhCuBVz+BEAGFaIFtgQiFDgKJHIFshBeQIi4HAoERgQkEhFyHAoMgCxiCJIc0hyWOQYYRAYNDgVwjgVUzGiSDOwmFeINFYYY0PgEyAY5bAQE X-IPAS-Result: A2EaAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBVAEBAQEBAQsBggNmcDmHQoUtix2EOoZahSyJF4FmDR+BEYM8AoNuIjcGDQEDAQECAQECAgJpHAyEIV8+BjIBRhBRIRwaBg4FgyEBgWkDFAGofINxhAUNghkJAYdQhCuBVz+BEAGFaIFtgQiFDgKJHIFshBeQIi4HAoERgQkEhFyHAoMgCxiCJIc0hyWOQYYRAYNDgVwjgVUzGiSDOwmFeINFYYY0PgEyAY5bAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609580" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:01 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0ATAACO3/Jb/xBhWMBiGgEBAQEBAgEBAQEHAgEBAQGBVAIBAQEBCwGCaU8hOYxvljGFLIkXgWYNH4RNAoQPNwYNAQMBAQIBAQJtHAyFPQYyAUYQUSEcGgYOBYMhAYFpAxWodod2DYIZCQGHUIYCP4EQAYVogW2BCIUOAokcgWyEF5AiLgcCgRGBCQSEXIcCgyALGIIkhzSHJY5BiVWBXCKBVTMaJIM7CYV4g0VhhjQ+AzABjlsBAQ X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618104" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:02 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:02 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:31 +0100 Message-ID: <20190104003734.28052-5-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--7.824000-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 4/7] riscv: remove RISC-V standalone linker script 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" Standalone applications do not require a separate linker script and can use the default linker script of the compiler instead. Remove the RISC-V standalone linker script. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v2: None arch/riscv/config.mk | 1 - examples/standalone/riscv.lds | 40 ----------------------------------- 2 files changed, 41 deletions(-) delete mode 100644 examples/standalone/riscv.lds diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk index ff4fe64001..e484a3f0ef 100644 --- a/arch/riscv/config.mk +++ b/arch/riscv/config.mk @@ -24,7 +24,6 @@ EFI_LDS := elf_riscv64_efi.lds endif CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 -LDFLAGS_STANDALONE += -T $(srctree)/examples/standalone/riscv.lds PLATFORM_CPPFLAGS += -ffixed-gp -fpic PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \ diff --git a/examples/standalone/riscv.lds b/examples/standalone/riscv.lds deleted file mode 100644 index 9a25861052..0000000000 --- a/examples/standalone/riscv.lds +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * Copyright (C) 2017 Andes Technology Corporation - * Rick Chen, Andes Technology Corporation - */ - -OUTPUT_ARCH(riscv) -ENTRY(_start) -SECTIONS -{ - . = ALIGN(4); - .text : - { - *(.text) - } - - . = ALIGN(4); - .data : { - __global_pointer$ = . + 0x800; - *(.data) - } - - . = ALIGN(4); - - .got : { - __got_start = .; - *(.got) - __got_end = .; - } - - . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss) } - __bss_end = .; - - . = ALIGN(4); - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - - _end = .; -} From patchwork Fri Jan 4 00:37:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020560 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5ZY3w9Kz9s7T for ; Fri, 4 Jan 2019 11:41:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 40E66C21C93; Fri, 4 Jan 2019 00:39: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.0 required=5.0 tests=none 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 6EDA0C21C93; Fri, 4 Jan 2019 00:38:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9FE9FC21C93; Fri, 4 Jan 2019 00:38:07 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id 1DA28C21DD7 for ; Fri, 4 Jan 2019 00:38:04 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokT4JshgGKWj4BMgGMDiqCIwEB X-IPAS-Result: A2FbAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokT4JshgGKWj4BMgGMDiqCIwEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609581" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:02 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkAACO3/Jb/xBhWMBiGwEBAQEDAQEBBwMBAQGBZYM5ITmMb5YxkCkNhGwChA84EgEDAQECAQECbRwMhT0GMgFGEFEhHBoGDgWDIYFqAxWodod2DYIZCQGHUIYCP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIYFVMxokT4JshgGKWj4DMAGMDiqCIwEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618105" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:03 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:03 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:32 +0100 Message-ID: <20190104003734.28052-6-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--6.197600-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 5/7] riscv: replace use of callee-saved register in standalone 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" Register x19 (s3) is a callee-saved register. It must not be used to load and jump to exported functions without saving it beforehand. Replace it with t0, a temporary and caller-saved register. Change the code comment to reflect this and fix it to correctly list gp as the register with the pointer to global data. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v2: None examples/standalone/stubs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index fadde669fa..f37d209da6 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -174,16 +174,16 @@ gd_t *global_data; : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "$r16"); #elif defined(CONFIG_RISCV) /* - * t7 holds the pointer to the global_data. gp is call clobbered. + * gp holds the pointer to the global_data. t0 is call clobbered. */ #define EXPORT_FUNC(f, a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ #x ":\n" \ -" lw x19, %0(gp)\n" \ -" lw x19, %1(x19)\n" \ -" jr x19\n" \ - : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "x19"); +" lw t0, %0(gp)\n" \ +" lw t0, %1(t0)\n" \ +" jr t0\n" \ + : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); #elif defined(CONFIG_ARC) /* * r25 holds the pointer to the global_data. r10 is call clobbered. From patchwork Fri Jan 4 00:37:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020557 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5X96Zktz9s7T for ; Fri, 4 Jan 2019 11:39:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 86562C21D8E; Fri, 4 Jan 2019 00:39: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=none 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 7F755C21DB3; Fri, 4 Jan 2019 00:38:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E7500C21D72; Fri, 4 Jan 2019 00:38:09 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id 1334EC21DFA for ; Fri, 4 Jan 2019 00:38:05 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2FCAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokgzuGAYpaPgEyAY5bAQE X-IPAS-Result: A2FCAAAO4PJb/xoBYJliGQEBAQEBAQEBAQEBAQcBAQEBAQGBZYIEgVY5jG+LHYsUkCkNhGwCg24iOBIBAwEBAgEBAgICaRwMhT4GMgFGEFEhHBoGDgWDIYFqAxQBqHyHdg2CGQkBh1CEK4FXP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIoFVMxokgzuGAYpaPgEyAY5bAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609582" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:03 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0A9AACO3/Jb/xBhWMBiGQEBAQEBAQEBAQEBAQcBAQEBAQGBZYM5ITmMb5YxkCkNhGwChA84EgEDAQECAQECbRwMhT0GMgFGEFEhHBoGDgWDIYFqAxWodod2DYIZCQGHUIYCP4Z5gnWFDgKLCJQ5LgcCgRGBCQSLXoMgCxiJWIcljkGJVYFdIYFVMxokgzuGAYpaPgMwAY5bAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618106" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:04 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:05 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:33 +0100 Message-ID: <20190104003734.28052-7-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--2.952100-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Cc: Greentime Hu Subject: [U-Boot] [PATCH v2 6/7] riscv: support standalone applications on RV64I systems X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add an implementation of EXPORT_FUNC() for RV64I systems to support them in standalone applications. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v2: None examples/standalone/stubs.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index f37d209da6..0827bde35e 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -176,6 +176,16 @@ gd_t *global_data; /* * gp holds the pointer to the global_data. t0 is call clobbered. */ +#ifdef CONFIG_ARCH_RV64I +#define EXPORT_FUNC(f, a, x, ...) \ + asm volatile ( \ +" .globl " #x "\n" \ +#x ":\n" \ +" ld t0, %0(gp)\n" \ +" ld t0, %1(t0)\n" \ +" jr t0\n" \ + : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); +#else #define EXPORT_FUNC(f, a, x, ...) \ asm volatile ( \ " .globl " #x "\n" \ @@ -184,6 +194,7 @@ gd_t *global_data; " lw t0, %1(t0)\n" \ " jr t0\n" \ : : "i"(offsetof(gd_t, jt)), "i"(FO(x)) : "t0"); +#endif #elif defined(CONFIG_ARC) /* * r25 holds the pointer to the global_data. r10 is call clobbered. From patchwork Fri Jan 4 00:37:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1020561 X-Patchwork-Delegate: uboot@andestech.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=aisec.fraunhofer.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 43W5Zp0K8Hz9s7T for ; Fri, 4 Jan 2019 11:41:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AE4CFC21DEC; Fri, 4 Jan 2019 00:39: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=none 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 71E90C21D8E; Fri, 4 Jan 2019 00:38:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EB21AC21DCA; Fri, 4 Jan 2019 00:38:09 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id EFC05C21C2C for ; Fri, 4 Jan 2019 00:38:05 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2GXAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEZnA5h0KFLYsdhDqGWpApDR+BEYM8AoNuIjgSAQMBAQIBAQICAmkcDIQhXz4GMgFGEFEhHBoGDgWDIQGBaQMUAah8g3GEBQ2CGQkBh1CEK4FXP4Z5gXGBBIUOAp9BLgcCgRGBCQSEXIcCgyALGIIkhzSHJY5BhhEBg0OBXSKBVTMaJIM7CYV4hCaGND4BMgGMDoJNAQE X-IPAS-Result: A2GXAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEZnA5h0KFLYsdhDqGWpApDR+BEYM8AoNuIjgSAQMBAQIBAQICAmkcDIQhXz4GMgFGEFEhHBoGDgWDIQGBaQMUAah8g3GEBQ2CGQkBh1CEK4FXP4Z5gXGBBIUOAp9BLgcCgRGBCQSEXIcCgyALGIIkhzSHJY5BhhEBg0OBXSKBVTMaJIM7CYV4hCaGND4BMgGMDoJNAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22609583" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jan 2019 01:38:04 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkAACO3/Jb/xBhWMBiGwEBAQEDAQEBBwMBAQGBZYJqTyE5jG+WMZApDR+ETQKEDzgSAQMBAQIBAQJtHAyFPQYyAUYQUSEcGgYOBYMhAYFpAxWodod2DYIZCQGHUIYCP4Z5gXGBBIUOAp9BLgcCgRGBCQSEXIcCgyALGIIkhzSHJY5BiVWBXSGBVTMaJIM7CYV4hCaGND4DMAGMDoJNAQE X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25618107" Received: from fgdemucivp01ltm.xch.fraunhofer.de (HELO FGDEMUCIMP12EXC.ads.fraunhofer.de) ([192.88.97.16]) by mail-mtaKA26.fraunhofer.de with ESMTP/TLS/AES256-SHA; 04 Jan 2019 01:38:05 +0100 Received: from localhost.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 4 Jan 2019 01:38:05 +0100 From: Lukas Auer To: Date: Fri, 4 Jan 2019 01:37:34 +0100 Message-ID: <20190104003734.28052-8-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> References: <20190104003734.28052-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24328.005 X-TM-AS-Result: No--5.011700-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Subject: [U-Boot] [PATCH v2 7/7] riscv: qemu: define standalone load address 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" We need to define the standalone load address to use standalone application on qemu-riscv. Define it and set it equal to CONFIG_SYS_LOAD_ADDR. To not overwrite it, change the assigned of CONFIG_STANDALONE_LOAD_ADDR in arch/riscv/config.mk to a conditional one. Signed-off-by: Lukas Auer Reviewed-by: Bin Meng Tested-by: Bin Meng --- Changes in v2: None arch/riscv/config.mk | 2 +- include/configs/qemu-riscv.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk index e484a3f0ef..84654eb3ed 100644 --- a/arch/riscv/config.mk +++ b/arch/riscv/config.mk @@ -23,7 +23,7 @@ PLATFORM_LDFLAGS += -m $(64bit-emul) EFI_LDS := elf_riscv64_efi.lds endif -CONFIG_STANDALONE_LOAD_ADDR = 0x00000000 +CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_CPPFLAGS += -ffixed-gp -fpic PLATFORM_RELFLAGS += -fno-common -gdwarf-2 -ffunction-sections \ diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index b29d155d09..2588c5a0b2 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -17,6 +17,8 @@ #define CONFIG_SYS_BOOTM_LEN SZ_16M +#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 + /* Environment options */ #define CONFIG_ENV_SIZE SZ_4K