From 43cf0f0826720951a803309d16852cab9461ed13 Mon Sep 17 00:00:00 2001 From: "freddy.li" Date: Sat, 20 Nov 2021 18:10:35 +0800 Subject: [PATCH] Solve the problem of compilation failure after opening SPINAND. --- components/fs/fatfs/fatfs.mk | 5 +---- components/fs/fs.mk | 11 ++++------- services/microPython | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/components/fs/fatfs/fatfs.mk b/components/fs/fatfs/fatfs.mk index c556791..6533e04 100644 --- a/components/fs/fatfs/fatfs.mk +++ b/components/fs/fatfs/fatfs.mk @@ -25,10 +25,7 @@ $(NAME)_SRCS += \ GLOBAL_INCS += \ . \ - include \ - ../include \ - - + include $(NAME)_CFLAGS = \ diff --git a/components/fs/fs.mk b/components/fs/fs.mk index 47492a2..932327c 100644 --- a/components/fs/fs.mk +++ b/components/fs/fs.mk @@ -18,19 +18,16 @@ include config/$(KCONFIG_CONFIG) GLOBAL_INCS = include +ifeq ($(CONFIG_SPINAND), y) $(NAME)_SRCS += \ - vfs/vfs.c \ - - + vfs/vfs.c - -ifeq ($(CONFIG_SPINAND), y) $(NAME)_SRCS += yaffs/helios_yaffs_vfs.c -$(NAME)_COMPONENTS := components/fs/yaffs +$(NAME)_COMPONENTS += components/fs/yaffs endif ifeq ($(CONFIG_SPI_SDCARD), y) -$(NAME)_COMPONENTS := components/fs/fatfs +$(NAME)_COMPONENTS += components/fs/fatfs endif diff --git a/services/microPython b/services/microPython index 860c97e..b104055 160000 --- a/services/microPython +++ b/services/microPython @@ -1 +1 @@ -Subproject commit 860c97ee0937982e92fc78eedcbc75700068724c +Subproject commit b104055a2ad9cb5af62ee9c0bc28249cc390fc0c -- Gitee