Bläddra i källkod

opensbi: Bump to version 0.3

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Alistair Francis 5 år sedan
förälder
incheckning
577898d7ae

+ 0 - 82
recipes-bsp/opensbi/files/0002-Makefile-Set-the-platform-variables-before-parsing-t.patch

@@ -1,82 +0,0 @@
-From afdb9343e167ff0ef2f573e6866f5b0c7c717c76 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@wdc.com>
-Date: Fri, 22 Feb 2019 15:02:55 -0800
-Subject: [PATCH 2/2] Makefile: Set the platform variables before parsing the
- platforms
-
-Ensure the platform variable PLATFORM_RISCV_XLEN is set before we parse
-the platform files.
-
-This fixes the 32-bit openSBI FW_JUMP_ADDR.
-
-Upstream-Status: Submitted [https://github.com/riscv/opensbi/pull/73]
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
----
- Makefile | 44 ++++++++++++++++++++++----------------------
- 1 file changed, 22 insertions(+), 22 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 10851fc..e60e762 100644
---- a/Makefile
-+++ b/Makefile
-@@ -74,6 +74,28 @@ DTC		=	dtc
- # Guess the compillers xlen
- OPENSBI_CC_XLEN := $(shell TMP=`$(CC) -dumpmachine | sed 's/riscv\([0-9][0-9]\).*/\1/'`; echo $${TMP})
- 
-+# Setup platform XLEN, ABI, ISA and Code Model
-+ifndef PLATFORM_RISCV_XLEN
-+  ifeq ($(OPENSBI_CC_XLEN), 32)
-+    PLATFORM_RISCV_XLEN = 32
-+  else
-+    PLATFORM_RISCV_XLEN = 64
-+  endif
-+endif
-+ifndef PLATFORM_RISCV_ABI
-+  ifeq ($(PLATFORM_RISCV_XLEN), 32)
-+    PLATFORM_RISCV_ABI = ilp$(PLATFORM_RISCV_XLEN)
-+  else
-+    PLATFORM_RISCV_ABI = lp$(PLATFORM_RISCV_XLEN)
-+  endif
-+endif
-+ifndef PLATFORM_RISCV_ISA
-+  PLATFORM_RISCV_ISA = rv$(PLATFORM_RISCV_XLEN)imafdc
-+endif
-+ifndef PLATFORM_RISCV_CODE_MODEL
-+  PLATFORM_RISCV_CODE_MODEL = medany
-+endif
-+
- # Setup list of objects.mk files
- ifdef PLATFORM
- platform-object-mks=$(shell if [ -d $(platform_dir) ]; then find $(platform_dir) -iname "objects.mk" | sort -r; fi)
-@@ -112,28 +134,6 @@ deps-y+=$(platform-common-objs-path-y:.o=.dep)
- deps-y+=$(lib-objs-path-y:.o=.dep)
- deps-y+=$(firmware-objs-path-y:.o=.dep)
- 
--# Setup platform XLEN, ABI, ISA and Code Model
--ifndef PLATFORM_RISCV_XLEN
--  ifeq ($(OPENSBI_CC_XLEN), 32)
--    PLATFORM_RISCV_XLEN = 32
--  else
--    PLATFORM_RISCV_XLEN = 64
--  endif
--endif
--ifndef PLATFORM_RISCV_ABI
--  ifeq ($(PLATFORM_RISCV_XLEN), 32)
--    PLATFORM_RISCV_ABI = ilp$(PLATFORM_RISCV_XLEN)
--  else
--    PLATFORM_RISCV_ABI = lp$(PLATFORM_RISCV_XLEN)
--  endif
--endif
--ifndef PLATFORM_RISCV_ISA
--  PLATFORM_RISCV_ISA = rv$(PLATFORM_RISCV_XLEN)imafdc
--endif
--ifndef PLATFORM_RISCV_CODE_MODEL
--  PLATFORM_RISCV_CODE_MODEL = medany
--endif
--
- # Setup compilation commands flags
- GENFLAGS	=	-I$(platform_dir)/include
- GENFLAGS	+=	-I$(platform_common_dir)/include
--- 
-2.20.1
-

+ 6 - 4
recipes-bsp/opensbi/opensbi_0.2.bb → recipes-bsp/opensbi/opensbi_0.3.bb

@@ -8,13 +8,15 @@ require opensbi-payloads.inc
 
 inherit autotools-brokensep
 
-SRC_URI = "https://github.com/riscv/opensbi/archive/v${PV}.tar.gz \
+SRCREV = "ca20ac0cd4c099006d4eea4d9ac7bd7b58e2ae0f"
+SRC_URI = "git://github.com/riscv/opensbi.git \
            file://0001-Makefile-Don-t-specify-mabi-or-march.patch \
-           file://0002-Makefile-Set-the-platform-variables-before-parsing-t.patch \
           "
 
-SRC_URI[md5sum] = "adb2da859f9b77eccc5de871ecf84093"
-SRC_URI[sha256sum] = "2d3de5a2e2fec71c79ec1a72d36302a5d8b814f20fa73d9fec854e3eef755e1c"
+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