From f93cce53b757d77ae1f31db56b97a06491ec65b3 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 3 Jun 2021 09:46:26 +1000 Subject: [PATCH] recipes-bsp/opensbi: Drop the BeagleV patch Signed-off-by: Alistair Francis --- ...15b268f6e1502f53af992ead5da466f950a8.patch | 37 ------------------- recipes-bsp/opensbi/opensbi_0.9.bbappend | 5 --- 2 files changed, 42 deletions(-) delete mode 100644 recipes-bsp/opensbi/files/926215b268f6e1502f53af992ead5da466f950a8.patch delete mode 100644 recipes-bsp/opensbi/opensbi_0.9.bbappend diff --git a/recipes-bsp/opensbi/files/926215b268f6e1502f53af992ead5da466f950a8.patch b/recipes-bsp/opensbi/files/926215b268f6e1502f53af992ead5da466f950a8.patch deleted file mode 100644 index c1f274b..0000000 --- a/recipes-bsp/opensbi/files/926215b268f6e1502f53af992ead5da466f950a8.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 926215b268f6e1502f53af992ead5da466f950a8 Mon Sep 17 00:00:00 2001 -From: Atish Patra -Date: Tue, 1 Jun 2021 16:05:30 -0700 -Subject: [PATCH] firmware: Do not allow harts with different XLEN to boot - -OpenSBI is built separately for RV32/RV64. Thus, it shouldn't try to boot -harts with a different XLEN compared to what it is compiled with. - -This patch fixes the issue observed in beagleV which has two U74(RV64) and -one E24 (RV32) harts. - -Signed-off-by: Atish Patra ---- - firmware/fw_base.S | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/firmware/fw_base.S b/firmware/fw_base.S -index a5ce946a..ae12a126 100644 ---- a/firmware/fw_base.S -+++ b/firmware/fw_base.S -@@ -47,6 +47,16 @@ - .globl _start - .globl _start_warm - _start: -+ csrr t0, misa -+ slti t1, t0, 0 -+ slli t1, t1, 1 -+ slli t0, t0, 1 -+ slti t0, t0, 0 -+ add t2, t0, t1 -+ li t3, __riscv_xlen -+ srli t3, t3, 5 -+ bne t2, t3, _start_hang -+ - /* Find preferred boot HART id */ - MOV_3R s0, a0, s1, a1, s2, a2 - call fw_boot_hart diff --git a/recipes-bsp/opensbi/opensbi_0.9.bbappend b/recipes-bsp/opensbi/opensbi_0.9.bbappend deleted file mode 100644 index 9d1158d..0000000 --- a/recipes-bsp/opensbi/opensbi_0.9.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_append_beaglev-starlight-jh7100 = " \ - file://926215b268f6e1502f53af992ead5da466f950a8.patch \ - "