Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 .../recipes-support/devmem2/devmem2.bbappend       |  1 -
 ...sure-word-is-32-bit-and-add-support-for-6.patch | 70 ----------------------
 2 files changed, 71 deletions(-)
 delete mode 100644 
meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch

diff --git a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend 
b/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
index 1e30c9b..281b76a 100644
--- a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
+++ b/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
@@ -1,6 +1,5 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += " \
-file://0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch \
 file://0001-devmem2-support-different-page-sizes-at-run-time.patch \
 "
diff --git 
a/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch
 
b/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch
deleted file mode 100644
index ad8ae67..0000000
--- 
a/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem.c-ensure-word-is-32-bit-and-add-support-for-6.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1360a907879dd24041797a3b709d49aeac2ab444 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <[email protected]>
-Date: Tue, 29 May 2018 16:55:42 -0400
-Subject: [PATCH] devmem.c: ensure word is 32-bit and add support for 64-bit
- double
-
-Signed-off-by: Denys Dmytriyenko <[email protected]>
----
- devmem2.c | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/devmem2.c b/devmem2.c
-index 5845381..68131b2 100644
---- a/devmem2.c
-+++ b/devmem2.c
-@@ -39,6 +39,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-@@ -69,7 +70,7 @@ int main(int argc, char **argv) {
-       if(argc < 2) {
-               fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n"
-                       "\taddress : memory address to act upon\n"
--                      "\ttype    : access operation type : [b]yte, 
[h]alfword, [w]ord\n"
-+                      "\ttype    : access operation type : [b]yte, 
[h]alfword, [w]ord, [d]ouble\n"
-                       "\tdata    : data to be written\n\n",
-                       argv[0]);
-               exit(1);
-@@ -103,9 +104,14 @@ int main(int argc, char **argv) {
-                       read_result = *((unsigned short *) virt_addr);
-                       break;
-               case 'w':
--                      data_size = sizeof(unsigned long);
-+                      data_size = sizeof(uint32_t);
-                       virt_addr = fixup_addr(virt_addr, data_size);
--                      read_result = *((unsigned long *) virt_addr);
-+                      read_result = *((uint32_t *) virt_addr);
-+                      break;
-+              case 'd':
-+                      data_size = sizeof(uint64_t);
-+                      virt_addr = fixup_addr(virt_addr, data_size);
-+                      read_result = *((uint64_t *) virt_addr);
-                       break;
-               default:
-                       fprintf(stderr, "Illegal data type '%c'.\n", 
access_type);
-@@ -129,9 +135,14 @@ int main(int argc, char **argv) {
-                               read_result = *((unsigned short *) virt_addr);
-                               break;
-                       case 'w':
--                              virt_addr = fixup_addr(virt_addr, 
sizeof(unsigned long));
--                              *((unsigned long *) virt_addr) = write_val;
--                              read_result = *((unsigned long *) virt_addr);
-+                              virt_addr = fixup_addr(virt_addr, 
sizeof(uint32_t));
-+                              *((uint32_t *) virt_addr) = write_val;
-+                              read_result = *((uint32_t *) virt_addr);
-+                              break;
-+                      case 'd':
-+                              virt_addr = fixup_addr(virt_addr, 
sizeof(uint64_t));
-+                              *((uint64_t *) virt_addr) = write_val;
-+                              read_result = *((uint64_t *) virt_addr);
-                               break;
-               }
-               sprintf(fmt_str, "Write at address 0x%%08lX (%%p): 0x%%0%dlX, "
--- 
-2.7.4
-
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to