the following patch was just integrated into master: commit 27a1be9169eb165d4f23ef19042f26db3769c24f Author: Jens Rottmann JRottmann@LiPPERTembedded.de Date: Wed Apr 3 10:12:55 2013 +0200
Partially revert "AMD Inagua: broadcom.c: Add missing prototype for `broadcom_init()`"
Commit 5d741567 added a prototype to broadcom.c to fix a warning. This part is fine.
It also changed mainboard.c to #include broadcom.c. But broadcom.c is already in Makefile.inc, now building will fail because the linker gets broadcom_init() twice.
Undo the change to mainboard.c but keep the change to broadcom.c.
Change-Id: Ieccc098f477ffacccf4174056998034a220a9744 Signed-off-by: Jens Rottmann JRottmann@LiPPERTembedded.de Reviewed-on: http://review.coreboot.org/3012 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Marc Jones marc.jones@se-eng.com
Build-Tested: build bot (Jenkins) at Wed Apr 3 11:28:42 2013, giving +1 See http://review.coreboot.org/3012 for details.
-gerrit