diff options
Diffstat (limited to 'poky/meta/recipes-bsp/opensbi')
| -rw-r--r-- | poky/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch | 16 | ||||
| -rw-r--r-- | poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc | 20 | ||||
| -rw-r--r-- | poky/meta/recipes-bsp/opensbi/opensbi_0.6.bb (renamed from poky/meta/recipes-bsp/opensbi/opensbi_0.5.bb) | 9 |
3 files changed, 10 insertions, 35 deletions
diff --git a/poky/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/poky/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch index 9c2d0eb479..d2a8048e87 100644 --- a/poky/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch +++ b/poky/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch @@ -1,4 +1,4 @@ -From f5871e1f3650d6c8a032928cb5d8ca00c275c377 Mon Sep 17 00:00:00 2001 +From fe9860fd85e49a75bef545e5d9914070491e8002 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.francis@wdc.com> Date: Fri, 15 Feb 2019 14:57:41 -0800 Subject: [PATCH] Makefile: Don't specify mabi or march @@ -7,25 +7,26 @@ To avoid can't link double-float modules with soft-float modules errors when building 32-bit openSBI don't specify mabi or march. -Upstream-Status: Inappropriate [Fixes a 32-bit Yocto flow bug] +Upstream-Status: Inappropriate [Fixes a 32-bit OE flow bug] Signed-off-by: Alistair Francis <alistair.francis@wdc.com> + --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile -index ae68f55..10851fc 100644 +index ccf8ea3..69e5b38 100644 --- a/Makefile +++ b/Makefile -@@ -145,7 +145,6 @@ GENFLAGS += $(firmware-genflags-y) - CFLAGS = -g -Wall -Werror -nostdlib -fno-strict-aliasing -O2 +@@ -169,7 +169,6 @@ GENFLAGS += $(firmware-genflags-y) + CFLAGS = -g -Wall -Werror -ffreestanding -nostdlib -fno-strict-aliasing -O2 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls CFLAGS += -mno-save-restore -mstrict-align -CFLAGS += -mabi=$(PLATFORM_RISCV_ABI) -march=$(PLATFORM_RISCV_ISA) CFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) CFLAGS += $(GENFLAGS) CFLAGS += $(platform-cflags-y) -@@ -158,7 +157,6 @@ CPPFLAGS += $(firmware-cppflags-y) +@@ -183,7 +182,6 @@ CPPFLAGS += $(firmware-cppflags-y) ASFLAGS = -g -Wall -nostdlib -D__ASSEMBLY__ ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls ASFLAGS += -mno-save-restore -mstrict-align @@ -33,6 +34,3 @@ index ae68f55..10851fc 100644 ASFLAGS += -mcmodel=$(PLATFORM_RISCV_CODE_MODEL) ASFLAGS += $(GENFLAGS) ASFLAGS += $(platform-asflags-y) --- -2.20.1 - diff --git a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc index b9714a7acb..2e32943245 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc +++ b/poky/meta/recipes-bsp/opensbi/opensbi-payloads.inc @@ -7,18 +7,8 @@ def riscv_get_extra_oemake_image(d): return "FW_PAYLOAD_PATH=" + deploy_dir + "/" + sbi_payload -def riscv_get_extra_oemake_fdt(d): - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') - deploy_dir = d.getVar('DEPLOY_DIR_IMAGE') - - if sbi_fdt_payload is None: - return "" - - return "FW_PAYLOAD_FDT_PATH=" + deploy_dir + "/" + sbi_fdt_payload - def riscv_get_do_compile_depends(d): sbi_payload = d.getVar('RISCV_SBI_PAYLOAD') - sbi_fdt_payload = d.getVar('RISCV_SBI_FDT') if sbi_payload is None: return "" @@ -26,14 +16,6 @@ def riscv_get_do_compile_depends(d): if 'linux' in sbi_payload or 'Image' in sbi_payload: return "virtual/kernel:do_deploy" if 'u-boot.bin' in sbi_payload: - # If we want U-Boot and a FDT then we need to depend on U-Boot and - # the kernel - if sbi_fdt_payload is not None: - return "virtual/bootloader:do_deploy virtual/kernel:do_deploy" - else: - return "virtual/bootloader:do_deploy" - # If we want a custom FDT then we need to depend on the kernel - if sbi_fdt_payload is not None: - return "virtual/kernel:do_deploy" + return "virtual/bootloader:do_deploy" return "" diff --git a/poky/meta/recipes-bsp/opensbi/opensbi_0.5.bb b/poky/meta/recipes-bsp/opensbi/opensbi_0.6.bb index 759bbbfdaa..56f2d4b915 100644 --- a/poky/meta/recipes-bsp/opensbi/opensbi_0.5.bb +++ b/poky/meta/recipes-bsp/opensbi/opensbi_0.6.bb @@ -2,25 +2,21 @@ SUMMARY = "RISC-V Open Source Supervisor Binary Interface (OpenSBI)" DESCRIPTION = "OpenSBI aims to provide an open-source and extensible implementation of the RISC-V SBI specification for a platform specific firmware (M-mode) and a general purpose OS, hypervisor or bootloader (S-mode or HS-mode). OpenSBI implementation can be easily extended by RISC-V platform or System-on-Chip vendors to fit a particular hadware configuration." LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING.BSD;md5=42dd9555eb177f35150cf9aa240b61e5" -DEPENDS += "dtc-native" require opensbi-payloads.inc inherit autotools-brokensep deploy -SRCREV = "be92da280d87c38a2e0adc5d3f43bab7b5468f09" +SRCREV = "ac5e821d50be631f26274765a59bc1b444ffd862" SRC_URI = "git://github.com/riscv/opensbi.git \ file://0001-Makefile-Don-t-specify-mabi-or-march.patch \ " S = "${WORKDIR}/git" -SRC_URI[md5sum] = "621f38d8205ef5fb185e4055025e73df" -SRC_URI[sha256sum] = "07f18b73abf3b85aabe5bead19a923716c100d30eb58033459f39c3a224be300" - EXTRA_OEMAKE += "PLATFORM=${RISCV_SBI_PLAT} I=${D}" # If RISCV_SBI_PAYLOAD is set then include it as a payload -EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)} ${@riscv_get_extra_oemake_fdt(d)}" +EXTRA_OEMAKE_append = " ${@riscv_get_extra_oemake_image(d)}" # Required if specifying a custom payload do_compile[depends] += "${@riscv_get_do_compile_depends(d)}" @@ -46,7 +42,6 @@ FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_jump.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_payload.*" FILES_${PN} += "/platform/${RISCV_SBI_PLAT}/firmware/fw_dynamic.*" - COMPATIBLE_HOST = "(riscv64|riscv32).*" INHIBIT_PACKAGE_STRIP = "1" |