From patchwork Tue Oct 30 12:55:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Auer X-Patchwork-Id: 990823 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 42ksHK3XG3z9s2P for ; Wed, 31 Oct 2018 00:09:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F1427C22137; Tue, 30 Oct 2018 12:59: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_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 B853CC22138; Tue, 30 Oct 2018 12:57:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6803DC220E8; Tue, 30 Oct 2018 12:57:17 +0000 (UTC) Received: from mail-edgeKA24.fraunhofer.de (mail-edgeka24.fraunhofer.de [153.96.1.24]) by lists.denx.de (Postfix) with ESMTPS id 389C4C22104 for ; Tue, 30 Oct 2018 12:57:13 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2EmAAC/VNhb/xoBYJlkHAEBAQQBAQcEAQGBUQcBAQsBggSCDYwOX6RmgXoNhGwCgyUiNA0NAQMBAQIBAQICAmkohTwGcAkQUVcGDgWDIYIBAaotiiYJAYc3hCaBWD+BEAGCZIR1gQSFDgKfEAcCgQ6BBASOZgsYiTqHDpcmgUM5gVUzGiSDO5BYbgGJKoJNAQE X-IPAS-Result: A2EmAAC/VNhb/xoBYJlkHAEBAQQBAQcEAQGBUQcBAQsBggSCDYwOX6RmgXoNhGwCgyUiNA0NAQMBAQIBAQICAmkohTwGcAkQUVcGDgWDIYIBAaotiiYJAYc3hCaBWD+BEAGCZIR1gQSFDgKfEAcCgQ6BBASOZgsYiTqHDpcmgUM5gVUzGiSDO5BYbgGJKoJNAQE X-IronPort-AV: E=Sophos;i="5.54,444,1534802400"; d="scan'208";a="10904632" Received: from mail-mtaka26.fraunhofer.de ([153.96.1.26]) by mail-edgeKA24.fraunhofer.de with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Oct 2018 13:57:13 +0100 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AzAACMVNhb/xBhWMBkHQEBBQEHBQGBUQgBCwGDVzqMDl+kZoF6DYRsAoNGNA0NAQMBAQIBAQJtKIU7BnAJEFFXBg4FgyGCAqouiiYJAYc3hX4/gRABgmSEdYEEhQ4CnxAHAoEOgQQEjmYLGIk6hw6XJoFDOIFVMxokgzuQWD4wAYkqgk0BAQ X-IronPort-AV: E=Sophos;i="5.54,444,1534802400"; d="scan'208";a="16525645" 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 Oct 2018 13:57:12 +0100 Received: from muc-nb-035.aisec.fraunhofer.de (10.80.233.51) by FGDEMUCIMP12EXC.ads.fraunhofer.de (10.80.232.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 30 Oct 2018 13:57:12 +0100 From: Lukas Auer To: Date: Tue, 30 Oct 2018 13:55:30 +0100 Message-ID: <20181030125553.5230-8-lukas.auer@aisec.fraunhofer.de> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181030125553.5230-1-lukas.auer@aisec.fraunhofer.de> References: <20181030125553.5230-1-lukas.auer@aisec.fraunhofer.de> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-11.0.0.4179-8.200.1013-24188.007 X-TM-AS-Result: No--2.044300-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Subject: [U-Boot] [PATCH v2 07/29] riscv: add Kconfig entries for the code model 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" RISC-V has two code models, medium low (medlow) and medium any (medany). Medlow limits addressable memory to a single 2 GiB range between the absolute addresses -2 GiB and +2 GiB. Medany limits addressable memory to any single 2 GiB address range. By default, medlow is selected on 32-bit systems and medany on 64-bit systems. This matches the configuration in Linux. The -mcmodel compiler flag is selected according to the Kconfig configuration. Signed-off-by: Lukas Auer --- Changes in v2: - Change ISA string construction, as suggested by Bin Meng arch/riscv/Kconfig | 19 +++++++++++++++++++ arch/riscv/Makefile | 9 ++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 0de77a75d7..371921b412 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -38,6 +38,25 @@ config ARCH_RV64I endchoice +choice + prompt "Code Model" + default CMODEL_MEDLOW if 32BIT + default CMODEL_MEDANY if 64BIT + +config CMODEL_MEDLOW + bool "medium low code model" + help + U-Boot and its statically defined symbols must lie within a single 2 GiB + address range and must lie between absolute addresses -2 GiB and +2 GiB. + +config CMODEL_MEDANY + bool "medium any code model" + help + U-Boot and its statically defined symbols must be within any single 2 GiB + address range. + +endchoice + config RISCV_ISA_C bool "Emit compressed instructions" default y diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 55d7c6550e..0b80eb8d86 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -17,8 +17,15 @@ endif ifeq ($(CONFIG_RISCV_ISA_C),y) ARCH_C = c endif +ifeq ($(CONFIG_CMODEL_MEDLOW),y) + CMODEL = medlow +endif +ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany +endif -ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) +ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) PLATFORM_CPPFLAGS += $(ARCH_FLAGS) CFLAGS_EFI += $(ARCH_FLAGS)