Hi,
attached patches add support for tinybootblock to the generic
Makefile.romccboard.inc, and move dell/s1850 (non-tinybootblock) and
emulation/qemu-x86 (tinybootblock) to use that instead of their own set
of rules.
emulation/qemu-x86 is boot tested.
All romcc-boards use Makefile.romccboard.inc after these patches.
Signed-off-by: Patrick Georgi <[email protected]>
Index: src/mainboard/Makefile.romccboard.inc
===================================================================
--- src/mainboard/Makefile.romccboard.inc (revision 5003)
+++ src/mainboard/Makefile.romccboard.inc (working copy)
@@ -19,27 +19,27 @@
##
initobj-y += crt0.o
-crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc
+crt0-$(CONFIG_BIG_BOOTBLOCK) += ../../../../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-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/cpu/x86/16bit/reset16.inc
+crt0-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/arch/i386/lib/cpu_reset.inc
+crt0-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/arch/i386/lib/id.inc
crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
crt0-$(CONFIG_CPU_AMD_GX1) += ../../../../src/cpu/amd/model_gx1/cpu_setup.inc
crt0-$(CONFIG_CPU_AMD_GX1) += ../../../../src/cpu/amd/model_gx1/gx_setup.inc
crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse_enable.inc
-crt0-y += failover.inc
+crt0-$(CONFIG_BIG_BOOTBLOCK) += failover.inc
crt0-y += auto.inc
crt0-$(CONFIG_SSE) += ../../../../src/cpu/x86/sse_disable.inc
crt0-$(CONFIG_MMX) += ../../../../src/cpu/x86/mmx_disable.inc
ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds
+ldscript-$(CONFIG_BIG_BOOTBLOCK) += ../../../../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
+ldscript-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/cpu/x86/16bit/reset16.lds
+ldscript-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/arch/i386/lib/id.lds
+ldscript-$(CONFIG_BIG_BOOTBLOCK) += ../../../../src/arch/i386/lib/failover.lds
driver-y += mainboard.o
Index: src/arch/i386/Kconfig
===================================================================
--- src/arch/i386/Kconfig (revision 5003)
+++ src/arch/i386/Kconfig (working copy)
@@ -44,6 +44,11 @@
bool
default n
+config BIG_BOOTBLOCK
+ bool
+ default n if TINY_BOOTBLOCK
+ default y
+
config BOOTBLOCK_NORTHBRIDGE_INIT
string
Index: util/compareboard/compareboard
===================================================================
--- util/compareboard/compareboard (revision 5003)
+++ util/compareboard/compareboard (working copy)
@@ -107,6 +107,7 @@
-e "/^CONFIG_VGA_BIOS / d" \
-e "/^CONFIG_WARNINGS_ARE_ERRORS / d" \
-e "/^CONFIG_TINY_BOOTBLOCK / d" \
+ -e "/^CONFIG_BIG_BOOTBLOCK / d" \
-e "/^CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT / d" \
-e "/^CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT / d" \
$A/new > $A/new.filtered
Index: src/mainboard/dell/s1850/Makefile.inc
===================================================================
--- src/mainboard/dell/s1850/Makefile.inc (revision 5003)
+++ src/mainboard/dell/s1850/Makefile.inc (working copy)
@@ -1,63 +1,3 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2009 Uwe Hermann <[email protected]>
-##
-## 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 -O2
+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 += ../../../../src/cpu/x86/fpu_enable.inc
-crt0-y += ../../../../src/cpu/x86/sse_enable.inc
-crt0-y += failover.inc
-crt0-y += auto.inc
-crt0-y += ../../../../src/cpu/x86/sse_disable.inc
-crt0-y += ../../../../src/cpu/x86/mmx_disable.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_GENERATE_MP_TABLE) += mptable.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-obj-$(CONFIG_HAVE_HARD_RESET) += reset.o
-
-ifdef POST_EVALUATION
-
-ROMCCFLAGS ?= -mcpu=p4 -O2
-
-$(obj)/mainboard/$(MAINBOARDDIR)/failover.inc: $(obj)/romcc
$(src)/arch/i386/lib/failover.c
- $(obj)/romcc $(ROMCCFLAGS) --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) $(INCLUDES)
$(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
-else
-$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc
$(src)/mainboard/$(MAINBOARDDIR)/auto.c
- $(obj)/romcc $(ROMCCFLAGS) $(INCLUDES)
$(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
-endif
-
-endif
-
Index: src/mainboard/emulation/qemu-x86/Makefile.inc
===================================================================
--- src/mainboard/emulation/qemu-x86/Makefile.inc (revision 5003)
+++ src/mainboard/emulation/qemu-x86/Makefile.inc (working copy)
@@ -1,16 +1,3 @@
-initobj-y += crt0.o
-crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
-crt0-y += auto.inc
+ROMCCFLAGS := -mcpu=i386 -O
+include $(src)/mainboard/Makefile.romccboard.inc
-obj-y += mainboard.o
-obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
-
-ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
-ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds
-
-ifdef POST_EVALUATION
-
-$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(obj)/romcc
$(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h
- $(obj)/romcc -mcpu=i386 -O $(INCLUDES)
$(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
-
-endif
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
