From ac94e06f0ba818157490587af1e4d0fb4cf3e962 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Fri, 7 Aug 2020 14:39:13 -0500
Subject: [PATCH] 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>
---
 ports/zephyr/main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 78b947d7a..74785cc83 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -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"