diff options
author | Alistair Francis <alistair.francis@wdc.com> | 2021-03-12 13:38:25 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-14 16:33:03 +0000 |
commit | a9666fbfe2dcb43fe9e8fd78e357eaacd99ca75e (patch) | |
tree | 004d2bed3fe3f8d495f50f3997a1c80060b9ee36 /meta | |
parent | 2cce2a296b4659a6c7e7f069e11f6f35957608d2 (diff) | |
download | openembedded-core-contrib-a9666fbfe2dcb43fe9e8fd78e357eaacd99ca75e.tar.gz |
u-boot: Add support for building for qemuriscv32
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/qemuriscv32.conf | 7 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch | 42 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2021.01.bb | 2 |
3 files changed, 47 insertions, 4 deletions
diff --git a/meta/conf/machine/qemuriscv32.conf b/meta/conf/machine/qemuriscv32.conf index 1413775ad6..d3858dc051 100644 --- a/meta/conf/machine/qemuriscv32.conf +++ b/meta/conf/machine/qemuriscv32.conf @@ -11,7 +11,6 @@ PREFERRED_VERSION_openocd = "riscv" XVISOR_PLAT = "riscv/virt32" -# u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules" -# EXTRA_IMAGEDEPENDS += "u-boot" -# UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" -# UBOOT_ELF = "u-boot" +EXTRA_IMAGEDEPENDS += "u-boot" +UBOOT_MACHINE = "qemu-riscv32_smode_defconfig" +UBOOT_ELF = "u-boot" diff --git a/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch new file mode 100644 index 0000000000..0ed3de4914 --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-riscv32-Use-double-float-ABI-for-rv32.patch @@ -0,0 +1,42 @@ +From 66dfe0fa886f6289add06d1af8642ce2b5302852 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 9 Feb 2021 16:40:12 -0800 +Subject: [PATCH] riscv32: Use double-float ABI for rv32 + +So it can use libgcc built with OE toolchain +Fixes +error: "can't link hard-float modules with soft-float modules" + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate [embedded specific] +--- + arch/riscv/Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d86..7324946f48 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -9,7 +9,9 @@ ifeq ($(CONFIG_ARCH_RV64I),y) + endif + ifeq ($(CONFIG_ARCH_RV32I),y) + ARCH_BASE = rv32im +- ABI = ilp32 ++ ABI = ilp32d ++ ARCH_D = d ++ ARCH_F = f + endif + ifeq ($(CONFIG_RISCV_ISA_A),y) + ARCH_A = a +@@ -24,7 +26,7 @@ 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_F)$(ARCH_D)$(ARCH_C) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.30.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb index 2eef1e900e..bbbc99bf8d 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2021.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2021.01.bb @@ -1,4 +1,6 @@ require u-boot-common.inc require u-boot.inc +SRC_URI_append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch" + DEPENDS += "bc-native dtc-native python3-setuptools-native" |