From 9ca1789ff099a364c6e16dcb6f6ad2e8677f32f1 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Tue, 18 Mar 2025 16:20:43 +0100
Subject: [PATCH] membuff: Rename the files to membuf

Rename the C and header files to use the membuf basename, to match the
functions.

Add a MAINTAINERS entry while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 MAINTAINERS                       | 7 +++++++
 include/asm-generic/global_data.h | 2 +-
 include/{membuff.h => membuf.h}   | 0
 lib/Makefile                      | 2 +-
 lib/{membuff.c => membuf.c}       | 2 +-
 5 files changed, 10 insertions(+), 3 deletions(-)
 rename include/{membuff.h => membuf.h} (100%)
 rename lib/{membuff.c => membuf.c} (99%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 92d4a158fd0..fac9ce81d70 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1281,6 +1281,13 @@ T:	git git://github.com/ARM-software/u-boot.git
 F:	drivers/video/mali_dp.c
 F:	drivers/i2c/i2c-versatile.c
 
+MEMBUF
+M:	Simon Glass <sjg@chromium.org>
+S:	Maintained
+T:	git https://source.denx.de/u-boot/u-boot.git
+F:	include/membuf.h
+F:	lib/membuf.c
+
 MICROBLAZE
 M:	Michal Simek <monstr@monstr.eu>
 S:	Maintained
diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 789adf2c3f9..18d94592b03 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -23,7 +23,7 @@
 #include <board_f.h>
 #include <event_internal.h>
 #include <fdtdec.h>
-#include <membuff.h>
+#include <membuf.h>
 #include <linux/list.h>
 #include <linux/build_bug.h>
 #include <asm-offsets.h>
diff --git a/include/membuff.h b/include/membuf.h
similarity index 100%
rename from include/membuff.h
rename to include/membuf.h
diff --git a/lib/Makefile b/lib/Makefile
index a30ce1595d5..41de2671cc6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -125,7 +125,7 @@ obj-y += hang.o
 obj-y += linux_compat.o
 obj-y += linux_string.o
 obj-$(CONFIG_$(PHASE_)LMB) += lmb.o
-obj-y += membuff.o
+obj-y += membuf.o
 obj-$(CONFIG_REGEX) += slre.o
 obj-y += string.o
 obj-y += tables_csum.o
diff --git a/lib/membuff.c b/lib/membuf.c
similarity index 99%
rename from lib/membuff.c
rename to lib/membuf.c
index 435d12b8a3c..5473efa98ca 100644
--- a/lib/membuff.c
+++ b/lib/membuf.c
@@ -9,7 +9,7 @@
 #include <errno.h>
 #include <log.h>
 #include <malloc.h>
-#include "membuff.h"
+#include "membuf.h"
 
 void membuf_purge(struct membuff *mb)
 {
-- 
2.39.5