djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr: Include storage/flash_map.h unconditionally. 

Include storage/flash_map.h unconditionally so we always have access to the
FLASH_AREA_LABEL_EXISTS macro, even if CONFIG_FLASH_MAP is not defined.

This fixes a build error for the qemu_x86 board:

main.c:108:63: error: missing binary operator before token "("
  108 |     #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)
      |                                                               ^
../../py/mkrules.mk:88: recipe for target 'build/genhdr/qstr.i.last' failed

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2020-08-07 14:39:13 -05:00 committed by Damien George
parent 60f5b941e0
commit ac94e06f0b
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/zephyr/main.c
View File

@ -38,9 +38,7 @@
#include <usb/usb_device.h>
#endif
#ifdef CONFIG_FLASH_MAP
#include <storage/flash_map.h>
#endif
#include "py/mperrno.h"
#include "py/compile.h"