From patchwork Sun Dec 30 18:27:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 1019464 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 43STXv4SFNz9s0n for ; Mon, 31 Dec 2018 05:31:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 188CFC21E42; Sun, 30 Dec 2018 18:29:49 +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 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 44C68C21E68; Sun, 30 Dec 2018 18:29:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 612ECC21DC1; Sun, 30 Dec 2018 18:28:35 +0000 (UTC) Received: from mail-edgeDD24.fraunhofer.de (mail-edgeDD24.fraunhofer.de [192.102.167.24]) by lists.denx.de (Postfix) with ESMTPS id B9057C21E49 for ; Sun, 30 Dec 2018 18:28:35 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2GWAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEZnA5h0KFLYsdhDqXAw0fgRGDPAKDbiI4EgEDAQECAQECAgJpHAyEIV8+BjIBRhBRPRoGDgWDIQGCAAGofINxhisJAYdQhCuBVz+IaoEEhQ4Cn28HAoERgQkEhFyKIgsYgiSHNIcllFIBg0OBXSKBVTMaJIM7CYoehjQ+ATIBjA6CTQEB X-IPAS-Result: A2GWAAAO4PJb/xoBYJliGgEBAQEBAgEBAQEHAgEBAQGBZYIEZnA5h0KFLYsdhDqXAw0fgRGDPAKDbiI4EgEDAQECAQECAgJpHAyEIV8+BjIBRhBRPRoGDgWDIQGCAAGofINxhisJAYdQhCuBVz+IaoEEhQ4Cn28HAoERgQkEhFyKIgsYgiSHNIcllFIBg0OBXSKBVTMaJIM7CYoehjQ+ATIBjA6CTQEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="22573581" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeDD24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Dec 2018 19:28:35 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0C2AgCO3/Jb/xBhWMBiHAEBAQQBAQcEAQGBZYJqTyE5jG+mWg0fhE0ChA84EgEDAQECAQECbRwMhT0GMgFGEFE9GgYOBYMhAYIBqHaKHAkBh1CGAj+IaoEEhQ4Cn28HAoERgQkEhFyKIgsYgiSHNIclmBaBXSGBVTMaJIM7CYoehjQ+AzABjA6CTQEB X-IronPort-AV: E=Sophos;i="5.56,253,1539640800"; d="scan'208";a="25375066" 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; 30 Dec 2018 19:28:35 +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; Sun, 30 Dec 2018 19:28:34 +0100 From: Lukas Auer To: Date: Sun, 30 Dec 2018 19:27:46 +0100 Message-ID: <20181230182746.23448-7-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181230182746.23448-1-lukas.auer@aisec.fraunhofer.de> References: <20181230182746.23448-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24324.005 X-TM-AS-Result: No--5.466200-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Subject: [U-Boot] [PATCH 6/6] 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 --- 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