diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-01-30 09:47:18 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-01-30 09:47:18 +0000 |
| commit | e37785791ae2be959cfe07962944745c81ca88f5 (patch) | |
| tree | 19371da337314f63e561feeac4cb923c49c64b72 /src/mainboard/kontron | |
| parent | 89e45773a977da2c996221b74aef06596d345211 (diff) | |
| download | coreboot-e37785791ae2be959cfe07962944745c81ca88f5.tar.xz | |
* fix crt0s/ldscripts paths to fix out of tree build.
* fix iasl output directory for i945 boards (patch
for moving it to the mainboard directory will follow)
* coreboot_table.c: lb_mainboard can be static
* coreboot_table.c: dump memory table in debug and spew mode
* fix a warning in bootblock.c
* don't include arch/i386/init in arch/i386/Makefile.inc
* announce generation of crt0_includes.h
* allow overriding $(obj)
* drop unused src_types from Makefile
* correctly use hostname -s instead of hostname for COMPILE_HOST
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5065 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/kontron')
| -rw-r--r-- | src/mainboard/kontron/986lcd-m/Makefile.inc | 16 | ||||
| -rw-r--r-- | src/mainboard/kontron/kt690/Makefile.inc | 22 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/mainboard/kontron/986lcd-m/Makefile.inc b/src/mainboard/kontron/986lcd-m/Makefile.inc index a9402a32de..bd0d7b9965 100644 --- a/src/mainboard/kontron/986lcd-m/Makefile.inc +++ b/src/mainboard/kontron/986lcd-m/Makefile.inc @@ -37,20 +37,20 @@ smmobj-$(CONFIG_HAVE_SMI_HANDLER) += mainboard_smi.o # This is part of the conversion to init-obj and away from included code. initobj-y += crt0.o -# FIXME in $(top)/Makefile -crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc -crt0-y += ../../../../src/cpu/intel/model_6ex/cache_as_ram.inc -crt0-y += auto.inc -ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb -ldscript-y += ../../../../src/cpu/x86/32bit/entry32.lds +crt0s := $(src)/cpu/x86/32bit/entry32.inc +crt0s += $(src)/cpu/intel/model_6ex/cache_as_ram.inc +crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc + +ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb +ldscripts += $(src)/cpu/x86/32bit/entry32.lds ifdef POST_EVALUATION $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl $(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src)/mainboard/$(MAINBOARDDIR) $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl -o $(obj)/dsdt.asl - iasl -p dsdt -tc $(obj)/dsdt.asl - mv dsdt.hex $@ + iasl -p $(obj)/dsdt -tc $(obj)/dsdt.asl + mv $(obj)/dsdt.hex $@ $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc index 317f9ca1c5..dda9ecf044 100644 --- a/src/mainboard/kontron/kt690/Makefile.inc +++ b/src/mainboard/kontron/kt690/Makefile.inc @@ -33,18 +33,18 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o initobj-y += crt0.o # FIXME in $(top)/Makefile -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/amd/car/cache_as_ram.inc -crt0-y += auto.inc +crt0s := $(src)/cpu/x86/16bit/entry16.inc +crt0s += $(src)/cpu/x86/32bit/entry32.inc +crt0s += $(src)/cpu/x86/16bit/reset16.inc +crt0s += $(src)/arch/i386/lib/id.inc +crt0s += $(src)/cpu/amd/car/cache_as_ram.inc +crt0s += $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc -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 +ldscripts := $(src)/arch/i386/init/ldscript_fallback_cbfs.lb +ldscripts += $(src)/cpu/x86/16bit/entry16.lds +ldscripts += $(src)/cpu/x86/16bit/reset16.lds +ldscripts += $(src)/arch/i386/lib/id.lds +ldscripts += $(src)/arch/i386/lib/failover.lds ifdef POST_EVALUATION |