[binutils-gdb] sim: bfin: fix the otp fix

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d699be882b42f36677836c320edbf7db24021a30

commit d699be882b42f36677836c320edbf7db24021a30
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sun May 23 22:15:01 2021 -0400

    sim: bfin: fix the otp fix
    
    I misread the code and thought data0/... were bu64 when they were
    actually bu32.  Fix the call to assemble the 2 64-bit values instead
    of passing the 2 halves of the first 64-bit value.

Diff:
---
 sim/bfin/ChangeLog     | 5 +++++
 sim/bfin/dv-bfin_otp.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 9c517d20bbe..29dfde8fe6e 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-23  Mike Frysinger  <vapier@gentoo.org>
+
+	* dv-bfin_otp.c (bfin_otp_write_page): Fix args to
+	bfin_otp_write_page_val2.
+
 2021-05-23  Mike Frysinger  <vapier@gentoo.org>
 
 	* dv-bfin_otp.c (bfin_otp_write_page): Call bfin_otp_write_page_val2.
diff --git a/sim/bfin/dv-bfin_otp.c b/sim/bfin/dv-bfin_otp.c
index 65afdf58b27..cdc010ae551 100644
--- a/sim/bfin/dv-bfin_otp.c
+++ b/sim/bfin/dv-bfin_otp.c
@@ -91,7 +91,8 @@ bfin_otp_write_page_val2 (struct bfin_otp *otp, bu16 page, bu64 lo, bu64 hi)
 static void
 bfin_otp_write_page (struct bfin_otp *otp, bu16 page)
 {
-  bfin_otp_write_page_val2 (otp, page, otp->data0, otp->data1);
+  bfin_otp_write_page_val2 (otp, page, (bu64)otp->data1 | otp->data0,
+			    (bu64)otp->data3 | otp->data2);
 }
 
 static unsigned