riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15892 from benpicco/pkg/fatfs-R0.14a

Browse Source 
pkg/fatfs: bump version to r0.14a
This commit is contained in:
Francisco 2021-02-02 16:28:53 +01:00 committed by GitHub
commit 746b91e1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/fatfs/Makefile
View File

@ -2,7 +2,7 @@ PKG_NAME=fatfs
# upstream server is very unreliable, instead host the extracted # upstream server is very unreliable, instead host the extracted
# .zip file on GitHub and apply only the upstream patches # .zip file on GitHub and apply only the upstream patches
PKG_URL=https://github.com/RIOT-OS/FatFS PKG_URL=https://github.com/RIOT-OS/FatFS
PKG_VERSION=d8db1de45234d7bcdb4c61e3a3d8af3c9cfb7819 # R0.14 p2 PKG_VERSION=fb99d00924fd17c2d9c0789510852c2c286403ab # R0.14a
PKG_LICENSE=BSD-1-Clause PKG_LICENSE=BSD-1-Clause
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

18
pkg/fatfs/patches/0001-remove-ffconf.h.patch
View File

@ -1,7 +1,7 @@
From fcd845f91417c7da0af266229f9997a2e3f08596 Mon Sep 17 00:00:00 2001 From af647820a330eae463fdf073908dc6f79014481d Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com> From: Benjamin Valentin <benpicco@googlemail.com>
Date: Tue, 10 Nov 2020 18:30:07 +0100 Date: Sun, 31 Jan 2021 20:00:17 +0100
Subject: [PATCH] remove ffconf.h Subject: [PATCH 1/2] remove ffconf.h
--- ---
source/ffconf.h | 298 ------------------------------------------------ source/ffconf.h | 298 ------------------------------------------------
@ -10,7 +10,7 @@ Subject: [PATCH] remove ffconf.h
diff --git a/source/ffconf.h b/source/ffconf.h diff --git a/source/ffconf.h b/source/ffconf.h
deleted file mode 100644 deleted file mode 100644
index 5dbe48b..0000000 index 632736b..0000000
--- a/source/ffconf.h --- a/source/ffconf.h
+++ /dev/null +++ /dev/null
@@ -1,298 +0,0 @@ @@ -1,298 +0,0 @@
@ -18,7 +18,7 @@ index 5dbe48b..0000000
-/ FatFs Functional Configurations -/ FatFs Functional Configurations
-/---------------------------------------------------------------------------*/ -/---------------------------------------------------------------------------*/
- -
-#define FFCONF_DEF 86606 /* Revision ID */ -#define FFCONF_DEF 80196 /* Revision ID */
- -
-/*---------------------------------------------------------------------------/ -/*---------------------------------------------------------------------------/
-/ Function Configurations -/ Function Configurations
@ -221,8 +221,8 @@ index 5dbe48b..0000000
-/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */ -/ To enable the 64-bit LBA, also exFAT needs to be enabled. (FF_FS_EXFAT == 1) */
- -
- -
-#define FF_MIN_GPT 0x100000000 -#define FF_MIN_GPT 0x10000000
-/* Minimum number of sectors to switch GPT format to create partition in f_mkfs and -/* Minimum number of sectors to switch GPT as partitioning format in f_mkfs and
-/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */ -/ f_fdisk function. 0x100000000 max. This option has no effect when FF_LBA64 == 0. */
- -
- -
@ -253,7 +253,7 @@ index 5dbe48b..0000000
-#define FF_FS_NORTC 0 -#define FF_FS_NORTC 0
-#define FF_NORTC_MON 1 -#define FF_NORTC_MON 1
-#define FF_NORTC_MDAY 1 -#define FF_NORTC_MDAY 1
-#define FF_NORTC_YEAR 2019 -#define FF_NORTC_YEAR 2020
-/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have -/* The option FF_FS_NORTC switches timestamp functiton. If the system does not have
-/ any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable -/ any RTC function or valid timestamp is not needed, set FF_FS_NORTC = 1 to disable
-/ the timestamp function. Every object modified by FatFs will have a fixed timestamp -/ the timestamp function. Every object modified by FatFs will have a fixed timestamp
@ -313,5 +313,5 @@ index 5dbe48b..0000000
- -
-/*--- End of configuration options ---*/ -/*--- End of configuration options ---*/
-- --
2.25.1 2.27.0

10
pkg/fatfs/patches/0002-remove-diskio.c.patch
View File

@ -1,6 +1,6 @@
From a80c84666ee68876c583af3e130025f2136455cf Mon Sep 17 00:00:00 2001 From 8b62c5ed1cc74007497baf3a93920bf9ebabf068 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@googlemail.com> From: Benjamin Valentin <benpicco@googlemail.com>
Date: Tue, 10 Nov 2020 18:39:58 +0100 Date: Sun, 31 Jan 2021 20:00:38 +0100
Subject: [PATCH 2/2] remove diskio.c Subject: [PATCH 2/2] remove diskio.c
--- ---
@ -10,12 +10,12 @@ Subject: [PATCH 2/2] remove diskio.c
diff --git a/source/diskio.c b/source/diskio.c diff --git a/source/diskio.c b/source/diskio.c
deleted file mode 100644 deleted file mode 100644
index fffa767..0000000 index 81aaf59..0000000
--- a/source/diskio.c --- a/source/diskio.c
+++ /dev/null +++ /dev/null
@@ -1,229 +0,0 @@ @@ -1,229 +0,0 @@
-/*-----------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------*/
-/* Low level disk I/O module skeleton for FatFs (C)ChaN, 2019 */ -/* Low level disk I/O module SKELETON for FatFs (C)ChaN, 2019 */
-/*-----------------------------------------------------------------------*/ -/*-----------------------------------------------------------------------*/
-/* If a working storage control module is available, it should be */ -/* If a working storage control module is available, it should be */
-/* attached to the FatFs via a glue function rather than modifying it. */ -/* attached to the FatFs via a glue function rather than modifying it. */
@ -244,5 +244,5 @@ index fffa767..0000000
-} -}
- -
-- --
2.25.1 2.27.0

2
pkg/fatfs/vendor/include/ffconf.h vendored
View File

@ -2,7 +2,7 @@
/ FatFs - Configuration file / FatFs - Configuration file
/---------------------------------------------------------------------------*/ /---------------------------------------------------------------------------*/
#define FFCONF_DEF 86606 /* Revision ID */ #define FFCONF_DEF 80196 /* Revision ID */
/*---------------------------------------------------------------------------/ /*---------------------------------------------------------------------------/
/ Function Configurations / Function Configurations