diff mbox series

[master/kirkstone,01/52] devmem2: remove upstreamed fix

Message ID 20220913040246.2365077-2-denis@denix.org
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Latest 2022.09 sync-up with Dunfell | expand

Commit Message

Denys Dmytriyenko Sept. 13, 2022, 4:01 a.m. UTC 
From: Denys Dmytriyenko <denys@konsulko.com>

As devmem2 was updated revamped in kirkstone upstream, drop local fix.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
---
 .../recipes-support/devmem2/devmem2.bbappend  |  5 ---
 ...ort-different-page-sizes-at-run-time.patch | 35 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
 delete mode 100644 meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend b/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
deleted file mode 100644
index f282b247..00000000
--- a/meta-arago-extras/recipes-support/devmem2/devmem2.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@ 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-file://0001-devmem2-support-different-page-sizes-at-run-time.patch \
-"
diff --git a/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch b/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
deleted file mode 100644
index 0da0732c..00000000
--- a/meta-arago-extras/recipes-support/devmem2/devmem2/0001-devmem2-support-different-page-sizes-at-run-time.patch
+++ /dev/null
@@ -1,35 +0,0 @@ 
-From 0f6af48b2fbc71ec8abe862d3e9eb6da7b03538b Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Wed, 8 Aug 2018 14:38:00 -0400
-Subject: [PATCH] devmem2: support different page sizes at run-time
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- devmem2.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/devmem2.c b/devmem2.c
-index 68131b2..76af2d6 100644
---- a/devmem2.c
-+++ b/devmem2.c
-@@ -53,8 +53,6 @@
- #define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \
-   __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0)
-  
--#define MAP_SIZE 4096UL
--#define MAP_MASK (MAP_SIZE - 1)
- 
- static inline void *fixup_addr(void *addr, size_t size);
- 
-@@ -66,6 +64,8 @@ int main(int argc, char **argv) {
- 	int access_type = 'w';
- 	char fmt_str[128];
- 	size_t data_size;
-+	unsigned long MAP_SIZE = sysconf(_SC_PAGE_SIZE);
-+	unsigned long MAP_MASK = (MAP_SIZE - 1);
- 	
- 	if(argc < 2) {
- 		fprintf(stderr, "\nUsage:\t%s { address } [ type [ data ] ]\n"
--- 
-2.7.4
-