Patchwork (no subject)

login
register
about
Submitter Vibrans, Frank
Date 2011-02-13 21:52:10
Message ID <276EC11373289744A112A8FE66755067019CFD642E@SAUSEXMBP01.amd.com>
Download mbox | patch
Permalink /patch/2631/
State Accepted
Headers show

Comments

Vibrans, Frank - 2011-02-13 21:52:10
Add support for AMD Agesa wrapper code.  Patch 5 of 8.

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@amd.com>

--
Stefan Reinauer - 2011-02-14 18:08:22
* Vibrans, Frank <Frank.Vibrans@amd.com> [110213 22:52]:
> Add support for AMD Agesa wrapper code.  Patch 5 of 8.
> 
> 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@amd.com>

Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Marc Jones - 2011-02-14 18:48:12
On Mon, Feb 14, 2011 at 11:08 AM, Stefan Reinauer
<stefan.reinauer@coreboot.org> wrote:
> * Vibrans, Frank <Frank.Vibrans@amd.com> [110213 22:52]:
>> Add support for AMD Agesa wrapper code.  Patch 5 of 8.
>>
>> 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@amd.com>
>
> Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

Acked-by: Marc Jones <marcj303@gmail.com>

We are accepting this patch, but we recognize the the .data area link
stage check needs to be addressed ASAP.

r6348

Patch

Add support for AMD Agesa wrapper code.  Patch 5 of 8.

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@amd.com>

Index: Official_coreboot/Makefile
===================================================================
--- Official_coreboot.orig/Makefile	2011-02-13 12:15:58.046767872 -0800
+++ Official_coreboot/Makefile	2011-02-13 07:59:44.887087000 -0800
@@ -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
Index: Official_coreboot/src/arch/x86/init/ldscript_fallback_cbfs.lb
===================================================================
--- Official_coreboot.orig/src/arch/x86/init/ldscript_fallback_cbfs.lb	2011-02-13 12:15:57.986768686 -0800
+++ Official_coreboot/src/arch/x86/init/ldscript_fallback_cbfs.lb	2011-02-12 17:58:29.266797000 -0800
@@ -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");
 }