Skip to content

Commit 2475fa9

Browse files
committed
Switch to lib-fatfs include; remove FATFS build flags
Point USB_HOST_MSC include to ../lib-fatfs instead of ../lib-hal/ff14b/source and remove the FATFS detection/conditional source additions from lib-hal/Rules.mk. The removed logic previously added ff14b/source and posix to EXTRA_SRCDIR when FATFS was enabled; posix is also removed from the default EXTRA_SRCDIR. This simplifies FATFS integration by centralizing headers in lib-fatfs and cleans up obsolete build-flag handling in lib-hal.
1 parent 409afc2 commit 2475fa9

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

common/make/gd32/Includes.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ifeq ($(findstring gd32h7xx,$(FAMILY)), gd32h7xx)
9595
endif
9696

9797
ifdef USB_HOST_MSC
98-
INCLUDES+=-I../lib-hal/ff14b/source
98+
INCLUDES+=-I../lib-fatfs
9999
endif
100100

101101
INCLUDES:= $(strip -I../${PROJECT}/include $(sort $(INCLUDES)))

lib-hal/Rules.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,6 @@ ifneq ($(MAKE_FLAGS),)
1818
endif
1919
endif
2020

21-
FATFS=
22-
ifeq ($(findstring CONFIG_USB_HOST_MSC,$(MAKE_FLAGS)), CONFIG_USB_HOST_MSC)
23-
FATFS=1
24-
endif
25-
26-
ifeq (,$(findstring DISABLE_FS,$(MAKE_FLAGS)))
27-
FATFS=1
28-
endif
29-
30-
ifdef FATFS
31-
EXTRA_SRCDIR+=ff14b/source
32-
EXTRA_SRCDIR+=posix
33-
endif
34-
3521
ifeq (,$(findstring DISABLE_RTC,$(MAKE_FLAGS)))
3622
EXTRA_SRCDIR+=rtc
3723
ifneq (,$(findstring DISABLE_INTERNAL_RTC,$(MAKE_FLAGS)))
@@ -56,8 +42,6 @@ else
5642
DEFINES+=DEBUG_I2C DEBUG_STACK DEBUG_POSIX
5743
EXTRA_INCLUDES+=debug/i2c debug/stack
5844
EXTRA_SRCDIR+=console/i2c console/null console/uart0
59-
EXTRA_SRCDIR+=posix
6045
EXTRA_SRCDIR+=rtc rtc/i2c
6146
EXTRA_SRCDIR+=superloop
62-
EXTRA_INCLUDES+=
6347
endif

0 commit comments

Comments
 (0)