From patchwork Thu Oct 1 17:56:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v2] r4701 - trunk/coreboot-v2/src/mainboard/dell/s1850 Date: Thu, 01 Oct 2009 17:56:20 -0000 From: Myles Watson X-Patchwork-Id: 317 Message-Id: <2831fecf0910011056idd4f79blbad853b90b8f0dd@mail.gmail.com> To: Patrick Georgi Cc: rminnich@gmail.com, coreboot@coreboot.org On Thu, Oct 1, 2009 at 11:24 AM, Patrick Georgi wrote: >> Modified: >>    trunk/coreboot-v2/src/mainboard/dell/s1850/Kconfig >>    trunk/coreboot-v2/src/mainboard/dell/s1850/Makefile.inc >> Log: >> OK, this builds and even looks right. dell needs its own Makefile.inc because >> it is a P4 and it needs SSE for romcc not to go into infinite loop. > Just setting ROMCCFLAGS should be enough, right? Almost. See patch. Signed-off-by: Myles Watson Thanks, Myles Index: svn/src/mainboard/dell/s1850/Makefile.inc =================================================================== --- svn.orig/src/mainboard/dell/s1850/Makefile.inc +++ svn/src/mainboard/dell/s1850/Makefile.inc @@ -1,63 +1,7 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## -## This program is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation; either version 2 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -## +ROMCCFLAGS := -mcpu=p4 + +include $(src)/mainboard/Makefile.romccboard.inc -initobj-y += crt0.o -crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc -crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc -crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc -crt0-y += ../../../../src/arch/i386/lib/cpu_reset.inc -crt0-y += ../../../../src/arch/i386/lib/id.inc -crt0-y += failover.inc -crt0-y += ../../../../src/cpu/x86/fpu/enable_fpu.inc -crt0-y += ../../../../src/cpu/x86/mmx/enable_mmx.inc crt0-y += ../../../../src/cpu/x86/sse/enable_sse.inc -crt0-y += auto.inc crt0-y += ../../../../src/cpu/x86/sse/disable_sse.inc -crt0-y += ../../../../src/cpu/x86/mmx/disable_mmx.inc - -ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb -ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds -ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds -ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds -ldscript-y += ../../../../src/arch/i386/lib/id.lds -ldscript-y += ../../../../src/arch/i386/lib/failover.lds - -driver-y += mainboard.o - -obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o -obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o - -ifdef POST_EVALUATION - -ROMCCFLAGS ?= -mcpu=p4 - -$(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc $(src)/arch/i386/lib/failover.c - $(obj)/romcc $(ROMCCFLAGS) -O2 --label-prefix=failover $(INCLUDES) $(src)/arch/i386/lib/failover.c -o $@ - -ifeq ($(CONFIG_HAVE_OPTION_TABLE),y) -$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h - $(obj)/romcc $(ROMCCFLAGS) -O2 $(INCLUDES) $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@ -else -$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc $(src)/mainboard/$(MAINBOARDDIR)/auto.c - $(obj)/romcc $(ROMCCFLAGS) -O2 $(INCLUDES) $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@ -endif - -endif