[coreboot] [commit] r6348 - in trunk: . src/arch/x86/init

[repository service]

Author: mjones
Date: Mon Feb 14 19:47:37 2011
New Revision: 6348
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6348

Log:
This code fixes a number of build issues related to the AMD Agesa code. The particular issues are global variables existing in romstage and the use of GCC intrinsics in the build. The former issue will be addressed shortly, and the latter issue requires community assistance. This code is dependent on the AMD Family 14h mainboard code.

Signed-off-by: Frank Vibrans <frank.vibrans at amd.com>
Acked-by: Stefan Reinauer <stefan.reinauer at coreboot.org>
Acked-by: Marc Jones <marcj303 at gmail.com>

Modified:
   trunk/Makefile
   trunk/src/arch/x86/init/ldscript_fallback_cbfs.lb

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Feb 14 19:42:12 2011	(r6347)
+++ trunk/Makefile	Mon Feb 14 19:47:37 2011	(r6348)
@@ -300,13 +300,16 @@
 # 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

Modified: trunk/src/arch/x86/init/ldscript_fallback_cbfs.lb
==============================================================================
--- trunk/src/arch/x86/init/ldscript_fallback_cbfs.lb	Mon Feb 14 19:42:12 2011	(r6347)
+++ trunk/src/arch/x86/init/ldscript_fallback_cbfs.lb	Mon Feb 14 19:47:37 2011	(r6348)
@@ -49,5 +49,6 @@
 		*(.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"); 
 }