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

Merge pull request #8614 from gebart/pr/tests-pkg_fatfs-mtd-fix

Browse Source 
tests/fatfs: Fix tests on native after configuration changes in #8272
This commit is contained in:
Joakim Nohlgård 2018-02-26 13:37:44 +01:00 committed by GitHub
commit 032b07cee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/pkg_fatfs/Makefile
View File

@ -32,10 +32,10 @@ FATFS_IMAGE_FILE_SIZE_MIB ?= 128
ifeq ($(BOARD),native) ifeq ($(BOARD),native)
#overwrite default mtd_native-config to use fat image as flash device #overwrite default mtd_native-config to use fat image as flash device
CFLAGS += -DMTD_NATIVE_FILENAME=\"./bin/riot_fatfs_disk.img\" CFLAGS += -DMTD_NATIVE_FILENAME=\"./bin/riot_fatfs_disk.img\"
CFLAGS += -DMTD_NATIVE_PAGE_SIZE=512 CFLAGS += -DMTD_PAGE_SIZE=512
CFLAGS += -DMTD_NATIVE_SECTOR_SIZE=512 CFLAGS += -DMTD_SECTOR_SIZE=512
CFLAGS += -DFATFS_IMAGE_FILE_SIZE_MIB=$(FATFS_IMAGE_FILE_SIZE_MIB) CFLAGS += -DFATFS_IMAGE_FILE_SIZE_MIB=$(FATFS_IMAGE_FILE_SIZE_MIB)
CFLAGS += -DMTD_NATIVE_SECTOR_NUM=\(\(\(FATFS_IMAGE_FILE_SIZE_MIB\)*1024*1024\)/MTD_NATIVE_SECTOR_SIZE\) CFLAGS += -DMTD_SECTOR_NUM=\(\(\(FATFS_IMAGE_FILE_SIZE_MIB\)*1024*1024\)/MTD_SECTOR_SIZE\)
else else
# for actual hardware use mtd_sdcard as storage device # for actual hardware use mtd_sdcard as storage device
USEMODULE += mtd_sdcard USEMODULE += mtd_sdcard

12
tests/pkg_fatfs_vfs/Makefile
View File

@ -13,14 +13,14 @@ ifeq ($(BOARD),native)
#overwrite default mtd_native-config to use fat image as flash device #overwrite default mtd_native-config to use fat image as flash device
MTD_NATIVE_FILENAME ?= \"./bin/riot_fatfs_disk.img\" MTD_NATIVE_FILENAME ?= \"./bin/riot_fatfs_disk.img\"
MTD_NATIVE_PAGE_SIZE ?= 512 MTD_PAGE_SIZE ?= 512
MTD_NATIVE_SECTOR_SIZE ?= 512 MTD_SECTOR_SIZE ?= 512
MTD_NATIVE_SECTOR_NUM ?= \(\(\(FATFS_IMAGE_FILE_SIZE_MIB\)*1024*1024\)/MTD_NATIVE_SECTOR_SIZE\) MTD_SECTOR_NUM ?= \(\(\(FATFS_IMAGE_FILE_SIZE_MIB\)*1024*1024\)/MTD_SECTOR_SIZE\)
CFLAGS += -DMTD_NATIVE_FILENAME=$(MTD_NATIVE_FILENAME) CFLAGS += -DMTD_NATIVE_FILENAME=$(MTD_NATIVE_FILENAME)
CFLAGS += -DMTD_NATIVE_PAGE_SIZE=$(MTD_NATIVE_PAGE_SIZE) CFLAGS += -DMTD_PAGE_SIZE=$(MTD_PAGE_SIZE)
CFLAGS += -DMTD_NATIVE_SECTOR_SIZE=$(MTD_NATIVE_SECTOR_SIZE) CFLAGS += -DMTD_SECTOR_SIZE=$(MTD_SECTOR_SIZE)
CFLAGS += -DFATFS_IMAGE_FILE_SIZE_MIB=$(FATFS_IMAGE_FILE_SIZE_MIB) CFLAGS += -DFATFS_IMAGE_FILE_SIZE_MIB=$(FATFS_IMAGE_FILE_SIZE_MIB)
CFLAGS += -DMTD_NATIVE_SECTOR_NUM=$(MTD_NATIVE_SECTOR_NUM) CFLAGS += -DMTD_SECTOR_NUM=$(MTD_SECTOR_NUM)
else else
USEMODULE += mtd_sdcard USEMODULE += mtd_sdcard
endif endif