1 files changed, 8 insertions, 5 deletions

diff --git a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch b/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
index 74d93618b2..d2a8048e87 100644
--- a/meta/recipes-bsp/opensbi/files/0001-Makefile-Don-t-specify-mabi-or-march.patch
+++ b/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,23 +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 ccf8ea3..69e5b38 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -162,7 +162,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)
-@@ -176,7 +175,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