1 files changed, 14 insertions, 3 deletions

diff --git a/firmware/export/config.h b/firmware/export/config.h
index 37ea9a1dd7..65f05b3e8e 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -635,6 +635,12 @@ Lyre prototype 1 */
 #endif
 #endif
 
+#if defined(__PCTOOL__) || defined(SIMULATOR)
+#ifndef CONFIG_PLATFORM
+#define CONFIG_PLATFORM PLATFORM_HOSTED
+#endif
+#endif
+
 #ifndef CONFIG_PLATFORM
 #define CONFIG_PLATFORM PLATFORM_NATIVE
 #endif
@@ -893,7 +899,8 @@ Lyre prototype 1 */
 #endif
 
 /* Bootloaders don't need multivolume awareness */
-#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
+#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) \
+    && !(CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(BOOT_REDIR)
 #undef HAVE_MULTIVOLUME
 #endif
 
@@ -1252,10 +1259,14 @@ Lyre prototype 1 */
 # define INCLUDE_TIMEOUT_API
 #endif
 
-#ifndef SIMULATOR
-#if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND) || (CONFIG_STORAGE & STORAGE_RAMDISK)
+#if (!defined(SIMULATOR) && !defined(HAVE_HOSTFS) && !(CONFIG_STORAGE & STORAGE_HOSTFS))
 #define STORAGE_GET_INFO
 #endif
+
+#if defined(HAVE_SIGALTSTACK_THREADS)
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 600   /* For sigaltstack */
+#endif
 #endif
 
 #ifdef CPU_MIPS