Attempt to fix regressions on x86 targets

Author: danielinux

arch.mk

@@ -983,7 +983,6 @@ ifeq ($(filter $(TARGET),x86_fsp_qemu kontron_vx3060_s2),$(TARGET))
   # some std libc have headers that bring in extra symbols used in
   # FORTIFY_SOURCE realated checks. Use -U_FORTIFY_SOURCE to avoid that.
   CFLAGS+=-U_FORTIFY_SOURCE
-  CFLAGS+=-DMMU=1
   ifeq ($(TARGET), kontron_vx3060_s2)
     FSP_TGL=1
     CFLAGS+=-DWOLFBOOT_TGL=1

src/elf.c

@@ -48,7 +48,7 @@
 #endif
 
 
-#ifdef MMU
+#if defined(MMU) || defined (WOLFBOOT_FSP)
 /* Loader for elf32 or elf64 format program headers
  * Returns the entry point function
  */