summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--src/arch/x86/init/ldscript_fallback_cbfs.lb3
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 35ca0c517ec5..43be315c89fe 100644
--- a/Makefile
+++ b/Makefile
@@ -300,13 +300,16 @@ INCLUDES += -Isrc/devices/oprom/include
# abspath is a workaround for romcc
INCLUDES += -include $(abspath $(obj)/config.h)
-CFLAGS = $(INCLUDES) -Os -nostdinc -pipe -g
+CFLAGS = $(INCLUDES) -Os -pipe -g
CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs
CFLAGS += -Wstrict-aliasing -Wshadow
ifeq ($(CONFIG_WARNINGS_ARE_ERRORS),y)
CFLAGS += -Werror
endif
+ifneq ($(CONFIG_AMD_AGESA),y)
+CFLAGS += -nostdinc
+endif
CFLAGS += -fno-common -ffreestanding -fno-builtin -fomit-frame-pointer
CBFS_COMPRESS_FLAG:=l
diff --git a/src/arch/x86/init/ldscript_fallback_cbfs.lb b/src/arch/x86/init/ldscript_fallback_cbfs.lb
index 480fd32d5df4..082b21193c95 100644
--- a/src/arch/x86/init/ldscript_fallback_cbfs.lb
+++ b/src/arch/x86/init/ldscript_fallback_cbfs.lb
@@ -49,5 +49,6 @@ SECTIONS
*(.comment.*)
*(.note.*)
}
- _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage");
+/* _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage"); */
+ _bogus = ASSERT((SIZEOF(.bss)) == 0, "Do not use global variables in romstage");
}