Author: myles Date: 2009-10-26 23:03:30 +0100 (Mon, 26 Oct 2009) New Revision: 4867
Added: trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc Removed: trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2891/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2892/Makefile.inc trunk/coreboot-v2/src/mainboard/tyan/s2895/Makefile.inc Log: Move src/mainboard/tyan/Makefile.s289x.inc to src/mainboard/Makefile.k8_CAR.inc.
Trivial.
Signed-off-by: Myles Watson mylesgw@gmail.com Acked-by: Myles Watson mylesgw@gmail.com
Copied: trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc (from rev 4863, trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc) =================================================================== --- trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc (rev 0) +++ trunk/coreboot-v2/src/mainboard/Makefile.k8_CAR.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -0,0 +1,71 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2007-2008 coresystems GmbH +## +## 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; version 2 of +## the License. +## +## 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 +## + +## +## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. +## + +driver-y += mainboard.o + +#needed by irq_tables and mptable and acpi_tables +obj-y += get_bus_conf.o +obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o +obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o + +#driver-y += ../../../drivers/i2c/i2cmux/i2cmux.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/16bit/entry16.inc +crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc +crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc +crt0-y += ../../../../src/southbridge/nvidia/ck804/id.inc +crt0-y += ../../../../src/southbridge/nvidia/ck804/romstrap.inc +crt0-y += ../../../../src/cpu/amd/car/cache_as_ram.inc +crt0-y += 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/southbridge/nvidia/ck804/id.lds +ldscript-y += ../../../../src/southbridge/nvidia/ck804/romstrap.lds +ldscript-y += ../../../../src/arch/i386/lib/failover.lds + +ifdef POST_EVALUATION + +$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl + iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl + mv dsdt.hex $@ + +$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ + +$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@ + perl -e 's/.rodata/.rom.data/g' -pi $@ + perl -e 's/.text/.section .rom.text/g' -pi $@ + +endif +
Modified: trunk/coreboot-v2/src/mainboard/msi/ms7135/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/msi/ms7135/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/msi/ms7135/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
Deleted: trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/Makefile.s289x.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1,71 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2007-2008 coresystems GmbH -## -## 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; version 2 of -## the License. -## -## 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 -## - -## -## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. -## - -driver-y += mainboard.o - -#needed by irq_tables and mptable and acpi_tables -obj-y += get_bus_conf.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - -#driver-y += ../../../drivers/i2c/i2cmux/i2cmux.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/16bit/entry16.inc -crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc -crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc -crt0-y += ../../../../src/southbridge/nvidia/ck804/id.inc -crt0-y += ../../../../src/southbridge/nvidia/ck804/romstrap.inc -crt0-y += ../../../../src/cpu/amd/car/cache_as_ram.inc -crt0-y += 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/southbridge/nvidia/ck804/id.lds -ldscript-y += ../../../../src/southbridge/nvidia/ck804/romstrap.lds -ldscript-y += ../../../../src/arch/i386/lib/failover.lds - -ifdef POST_EVALUATION - -$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl - iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl - mv dsdt.hex $@ - -$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@ - -$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c -o $@ - perl -e 's/.rodata/.rom.data/g' -pi $@ - perl -e 's/.text/.section .rom.text/g' -pi $@ - -endif -
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2850/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2875/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2881/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1,2 +1,2 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc driver-y += ../../../drivers/i2c/adm1027/adm1027.o
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2885/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2891/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2891/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2891/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2892/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2892/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2892/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1,3 +1,3 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc
driver-y += ../../../drivers/i2c/adm1027/adm1027.o
Modified: trunk/coreboot-v2/src/mainboard/tyan/s2895/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/mainboard/tyan/s2895/Makefile.inc 2009-10-26 21:42:13 UTC (rev 4866) +++ trunk/coreboot-v2/src/mainboard/tyan/s2895/Makefile.inc 2009-10-26 22:03:30 UTC (rev 4867) @@ -1 +1 @@ -include $(src)/mainboard/tyan/Makefile.s289x.inc +include $(src)/mainboard/Makefile.k8_CAR.inc