- Makefile.romccboard.inc supports tinybootblock romcc boards, too.
- via/epia-cn is a romcc board, not a CAR board. (Thanks Kevin, for the report) - Make emulation/qemu-x86, dell/s1850, via/epia-cn use Makefile.romccboard.inc - New flag: BIG_BOOTBLOCK, which is always the inverse of tinybootblock Suitable for Makefile.inc rules (foo-$(CONFIG_BIG_BOOTBLOCK) += ...) Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5005 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi
parent
f44eb7876b
commit
07684e6ce7
|
|
@ -44,6 +44,11 @@ config TINY_BOOTBLOCK
|
|||
bool
|
||||
default n
|
||||
|
||||
config BIG_BOOTBLOCK
|
||||
bool
|
||||
default n if TINY_BOOTBLOCK
|
||||
default y
|
||||
|
||||
config BOOTBLOCK_NORTHBRIDGE_INIT
|
||||
string
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,63 +1,3 @@
|
|||
##
|
||||
## This file is part of the coreboot project.
|
||||
##
|
||||
## Copyright (C) 2009 Uwe Hermann <uwe@hermann-uwe.de>
|
||||
##
|
||||
## 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
|
||||
##
|
||||
|
||||
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
|
||||
ROMCCFLAGS := -mcpu=p4 -O2
|
||||
include $(src)/mainboard/Makefile.romccboard.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,60 +1,3 @@
|
|||
##
|
||||
## This file is part of the coreboot project.
|
||||
##
|
||||
## Copyright (C) 2008 VIA Technologies, Inc.
|
||||
## (Written by Aaron Lwe <aaron.lwe@gmail.com> for VIA)
|
||||
##
|
||||
## 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
|
||||
##
|
||||
|
||||
initobj-y += crt0.o
|
||||
obj-y += mainboard.o
|
||||
obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o
|
||||
obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o
|
||||
|
||||
obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
|
||||
obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
|
||||
obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
|
||||
|
||||
ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb
|
||||
ldscript-y += ../../../../src/cpu/x86/16bit/entry16.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
|
||||
|
||||
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/id.inc
|
||||
crt0-y += ../../../../src/cpu/x86/fpu_enable.inc
|
||||
crt0-y += auto.inc
|
||||
crt0-y += ../../../../src/cpu/x86/mmx_disable.inc
|
||||
|
||||
ifdef POST_EVALUATION
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||
|
||||
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl
|
||||
mv dsdt.hex $@
|
||||
|
||||
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h
|
||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
|
||||
perl -e 's/\.rodata/.rom.data/g' -pi $@
|
||||
perl -e 's/\.text/.section .rom.text/g' -pi $@
|
||||
|
||||
endif
|
||||
ROMCCFLAGS := -mcpu=c3 -O
|
||||
include $(src)/mainboard/Makefile.romccboard.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -107,6 +107,7 @@ sed \
|
|||
-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
|
||||
|
|
|
|||
Loading…
Reference in New Issue