From f76b04e1332f9678d998424d3a259ba467723053 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 24 Mar 2026 02:54:23 +0100
Subject: [PATCH] build: Move FatFS build support

Use a separate build objects item for the FatFS to localize the use of command
line defines.
---
 spec/build/cpukit/librtemscpu.yml | 36 ++---------------------
 spec/build/cpukit/objfatfs.yml    | 47 +++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 33 deletions(-)
 create mode 100644 spec/build/cpukit/objfatfs.yml

diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index b4f53a7331..0c91b93ab8 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -4,31 +4,7 @@ cflags:
 - ${COVERAGE_COMPILER_FLAGS}
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH & Co. KG
-cppflags:
-- -Ddisk_status=rtems_fatfs_disk_status
-- -Ddisk_initialize=rtems_fatfs_disk_initialize
-- -Ddisk_read=rtems_fatfs_disk_read
-- -Ddisk_write=rtems_fatfs_disk_write
-- -Ddisk_ioctl=rtems_fatfs_disk_ioctl
-- -Dget_fattime=rtems_fatfs_get_fattime
-- -DFFCONF_DEF=80386
-- -DFF_VOLUMES=1
-- -DFF_USE_MKFS=1
-- -DFF_USE_CHMOD=1
-- -DFF_USE_LFN=1
-- -DFF_FS_RPATH=2
-- -DFF_FS_EXFAT=1
-- -DFF_MAX_SS=512
-- -DFF_MIN_SS=512
-- -DFF_LFN_BUF=255
-- -DFF_SFN_BUF=12
-- -DFF_MAX_LFN=255
-- -DFF_USE_LABEL=0
-- -DFF_PATH_DEPTH=10
-- -DFF_STR_VOLUME_ID=0
-- -DFF_MULTI_PARTITION=0
-- -DFF_FS_READONLY=0
-- -DFF_LBA64=0
+cppflags: []
 cxxflags:
 - ${COVERAGE_COMPILER_FLAGS}
 enabled-by: true
@@ -115,7 +91,6 @@ install:
   - cpukit/contrib/include/machine/_timecounter.h
 - destination: ${BSP_INCLUDEDIR}/rtems
   source:
-  - cpukit/contrib/include/rtems/fatfs.h
   - cpukit/contrib/include/rtems/mouse_parser.h
   - cpukit/include/rtems/assoc.h
   - cpukit/include/rtems/base64.h
@@ -536,6 +511,8 @@ links:
   uid: objdrvmgr
 - role: build-dependency
   uid: objexceptionmapping
+- role: build-dependency
+  uid: objfatfs
 - role: build-dependency
   uid: objgnat
 - role: build-dependency
@@ -896,13 +873,6 @@ source:
 - cpukit/libfs/src/dosfs/msdos_rename.c
 - cpukit/libfs/src/dosfs/msdos_rmnod.c
 - cpukit/libfs/src/dosfs/msdos_statvfs.c
-- cpukit/libfs/src/fatfs/ff.c
-- cpukit/libfs/src/fatfs/ffunicode.c
-- cpukit/libfs/src/fatfs/ffsystem.c
-- cpukit/libfs/src/fatfs/rtems-diskio.c
-- cpukit/libfs/src/fatfs/rtems-fatfs-init.c
-- cpukit/libfs/src/fatfs/rtems-fatfs-file.c
-- cpukit/libfs/src/fatfs/rtems-fatfs-dir.c
 - cpukit/libfs/src/imfs/deviceio.c
 - cpukit/libfs/src/imfs/imfs_add_node.c
 - cpukit/libfs/src/imfs/imfs_chown.c
diff --git a/spec/build/cpukit/objfatfs.yml b/spec/build/cpukit/objfatfs.yml
new file mode 100644
index 0000000000..fdb24b6c6f
--- /dev/null
+++ b/spec/build/cpukit/objfatfs.yml
@@ -0,0 +1,47 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2025 Sepehr Ganji <sepehrganji79@gmail.com>
+cppflags:
+- -Ddisk_status=rtems_fatfs_disk_status
+- -Ddisk_initialize=rtems_fatfs_disk_initialize
+- -Ddisk_read=rtems_fatfs_disk_read
+- -Ddisk_write=rtems_fatfs_disk_write
+- -Ddisk_ioctl=rtems_fatfs_disk_ioctl
+- -Dget_fattime=rtems_fatfs_get_fattime
+- -DFFCONF_DEF=80386
+- -DFF_VOLUMES=1
+- -DFF_USE_MKFS=1
+- -DFF_USE_CHMOD=1
+- -DFF_USE_LFN=1
+- -DFF_FS_RPATH=2
+- -DFF_FS_EXFAT=1
+- -DFF_MAX_SS=512
+- -DFF_MIN_SS=512
+- -DFF_LFN_BUF=255
+- -DFF_SFN_BUF=12
+- -DFF_MAX_LFN=255
+- -DFF_USE_LABEL=0
+- -DFF_PATH_DEPTH=10
+- -DFF_STR_VOLUME_ID=0
+- -DFF_MULTI_PARTITION=0
+- -DFF_FS_READONLY=0
+- -DFF_LBA64=0
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}/rtems
+  source:
+  - cpukit/contrib/include/rtems/fatfs.h
+links: []
+source:
+- cpukit/libfs/src/fatfs/ff.c
+- cpukit/libfs/src/fatfs/ffunicode.c
+- cpukit/libfs/src/fatfs/ffsystem.c
+- cpukit/libfs/src/fatfs/rtems-diskio.c
+- cpukit/libfs/src/fatfs/rtems-fatfs-init.c
+- cpukit/libfs/src/fatfs/rtems-fatfs-file.c
+- cpukit/libfs/src/fatfs/rtems-fatfs-dir.c
+type: build