eeva/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware synced 2024-11-18 17:09:41 +01:00
Code Issues Releases Wiki Activity

Merge #661

Browse source 
661: Microchip uboot build failure with nixpkgs 23.05 r=Mic92 a=codehub8



Co-authored-by: Ganga Ram <Ganga.Ram@tii.ae>
Co-authored-by: Ganga Ram <131853076+codehub8@users.noreply.github.com>
This commit is contained in:
bors[bot] 2023-07-11 07:30:19 +00:00 committed by GitHub
commit 44bc025007
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
microchip/common/bsp/patches/0002-Riscv-Fix-build-against-binutils-2.38.patch Normal file
View file

@ -0,0 +1,51 @@
From 8afd811876b1ce8d6da6d5c804452a2b15805f5a Mon Sep 17 00:00:00 2001
From: Ganga Ram <Ganga.Ram@tii.ae>
Date: Wed, 5 Jul 2023 11:32:44 +0400
Subject: [PATCH] From: Ganga Ram <Ganga.Ram@tii.ae> Date: Wed, 05 July 2023
06:15:22 +0400 Subject: [PATCH] Riscv-Fix-build-against-binutils-2.38
The following description is copied from the equivalent patch for the
Linux Kernel proposed by Aurelien Jarno:
From version 2.38, binutils default to ISA spec version 20191213. This
means that the csr read/write (csrr*/csrw*) instructions and fence.i
instruction has separated from the `I` extension, become two standalone
extensions: Zicsr and Zifencei. As the kernel uses those instruction,
this causes the following build failure:
arch/riscv/lib/cache.c:12: Error: unrecognized opcode `fence.i', extension `zifencei' required
arch/riscv/cpu/cpu.c:94: Error: unrecognized opcode `csrs sstatus,a5', extension `zicsr' required
arch/riscv/cpu/cpu.c:95: Error: unrecognized opcode `csrw 0x003,0', extension `zicsr' required
More detail: https://patchwork.ozlabs.org/series/283391/mbox/
Signed-off-by: Ganga Ram <Ganga.Ram@tii.ae>
---
arch/riscv/Makefile | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile
index 0b80eb8d86..53d1194ffb 100644
--- a/arch/riscv/Makefile
+++ b/arch/riscv/Makefile
@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y)
CMODEL = medany
endif
-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \
+RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C)
+
+# Newer binutils versions default to ISA spec version 20191213 which moves some
+# instructions from the I extension to the Zicsr and Zifencei extensions.
+toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei)
+ifeq ($(toolchain-need-zicsr-zifencei),y)
+ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei
+endif
+
+ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \
-mcmodel=$(CMODEL)
PLATFORM_CPPFLAGS += $(ARCH_FLAGS)
--
2.39.2

12
microchip/common/bsp/uboot.nix
View file

@ -8,20 +8,24 @@ with pkgs; let
in
buildUBoot rec {
pname = "uboot";
version = "linux4microchip+fpga-2023.02";
version = "linux4microchip+fpga-2023.06";
src = fetchFromGitHub {
owner = "polarfire-soc";
repo = "u-boot";
rev = "b356a897b11ef19dcbe7870530f23f3a978c1714";
sha256 = "sha256-ouNLnDBeEsaY/xr5tAVBUtLlj0eylWbKdlU+bQ2Ciq4=";
# from mpfs-uboot-2022.01 branch
rev = "7e19f9dff788025403ac6a34d9acf8736eef32ff";
sha256 = "sha256-1qmifjjNxPOUWRgZdQk6Ld5KGQk/PypSRK/ILPSsTLs";
};
extraMakeFlags = [
"OPENSBI=${opensbi}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin"
];
patches = [ ./patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch ];
patches = [
./patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch
./patches/0002-Riscv-Fix-build-against-binutils-2.38.patch
];
defconfig = "${targetBoard}_defconfig";
enableParallelBuilding = true;
extraMeta.platforms = ["riscv64-linux"];