Index: src/Kconfig =================================================================== --- src/Kconfig (revision 5166) +++ src/Kconfig (working copy) @@ -173,8 +173,19 @@ config HAVE_HARD_RESET bool + default y if BOARD_HAS_HARD_RESET default n + help + This variable specifies whether a given board has a hard_reset + function, no matter if it's provided by board code or chipset code. +config BOARD_HAS_HARD_RESET + bool + default n + help + This variable specifies whether a given board has a reset.c + file containing a hard_reset() function. + config HAVE_INIT_TIMER bool default n if UDELAY_IO Index: src/mainboard/Makefile.k8_ck804.inc =================================================================== --- src/mainboard/Makefile.k8_ck804.inc (revision 5166) +++ src/mainboard/Makefile.k8_ck804.inc (working copy) @@ -23,18 +23,13 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-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 -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o Index: src/mainboard/iwill/dk8_htx/Makefile.inc =================================================================== --- src/mainboard/iwill/dk8_htx/Makefile.inc (revision 5166) +++ src/mainboard/iwill/dk8_htx/Makefile.inc (working copy) @@ -17,12 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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) += ssdt2.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o @@ -30,9 +26,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/axus/tc320/Makefile.inc =================================================================== --- src/mainboard/axus/tc320/Makefile.inc (revision 5166) +++ src/mainboard/axus/tc320/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/bcom/winnetp680/Makefile.inc =================================================================== --- src/mainboard/bcom/winnetp680/Makefile.inc (revision 5166) +++ src/mainboard/bcom/winnetp680/Makefile.inc (working copy) @@ -19,14 +19,6 @@ ## 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 - - - Index: src/mainboard/bcom/winnet100/Makefile.inc =================================================================== --- src/mainboard/bcom/winnet100/Makefile.inc (revision 5166) +++ src/mainboard/bcom/winnet100/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/televideo/tc7020/Makefile.inc =================================================================== --- src/mainboard/televideo/tc7020/Makefile.inc (revision 5166) +++ src/mainboard/televideo/tc7020/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/broadcom/blast/Makefile.inc =================================================================== --- src/mainboard/broadcom/blast/Makefile.inc (revision 5166) +++ src/mainboard/broadcom/blast/Makefile.inc (working copy) @@ -4,4 +4,3 @@ obj-y += get_bus_conf.o obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o - Index: src/mainboard/thomson/ip1000/Makefile.inc =================================================================== --- src/mainboard/thomson/ip1000/Makefile.inc (revision 5166) +++ src/mainboard/thomson/ip1000/Makefile.inc (working copy) @@ -1,4 +1 @@ ROMCCFLAGS=-mcpu=p3 -O - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/supermicro/x6dai_g/Kconfig =================================================================== --- src/mainboard/supermicro/x6dai_g/Kconfig (revision 5166) +++ src/mainboard/supermicro/x6dai_g/Kconfig (working copy) @@ -6,6 +6,8 @@ select SOUTHBRIDGE_INTEL_ESB6300 select SUPERIO_WINBOND_W83627HF select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/supermicro/x6dai_g/Makefile.inc =================================================================== --- src/mainboard/supermicro/x6dai_g/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/x6dai_g/Makefile.inc (working copy) @@ -19,6 +19,3 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/supermicro/h8dmr/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/h8dmr/Makefile.inc (working copy) @@ -17,15 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/supermicro/x6dhe_g/Kconfig =================================================================== --- src/mainboard/supermicro/x6dhe_g/Kconfig (revision 5166) +++ src/mainboard/supermicro/x6dhe_g/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_WINBOND_W83627HF select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/supermicro/x6dhe_g/Makefile.inc =================================================================== --- src/mainboard/supermicro/x6dhe_g/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/x6dhe_g/Makefile.inc (working copy) @@ -19,7 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc obj-y += ../../../drivers/generic/debug/debug_dev.o - Index: src/mainboard/supermicro/h8dme/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dme/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/h8dme/Makefile.inc (working copy) @@ -17,16 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += mainboard.o obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/supermicro/h8dmr_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/h8dmr_fam10/Makefile.inc (working copy) @@ -17,15 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/supermicro/h8qme_fam10/Makefile.inc =================================================================== --- src/mainboard/supermicro/h8qme_fam10/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/h8qme_fam10/Makefile.inc (working copy) @@ -17,15 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/supermicro/x6dhe_g2/Kconfig =================================================================== --- src/mainboard/supermicro/x6dhe_g2/Kconfig (revision 5166) +++ src/mainboard/supermicro/x6dhe_g2/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_NSC_PC87427 select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/supermicro/x6dhe_g2/Makefile.inc =================================================================== --- src/mainboard/supermicro/x6dhe_g2/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/x6dhe_g2/Makefile.inc (working copy) @@ -19,7 +19,4 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc obj-y += ../../../drivers/generic/debug/debug_dev.o - Index: src/mainboard/supermicro/x6dhr_ig/Kconfig =================================================================== --- src/mainboard/supermicro/x6dhr_ig/Kconfig (revision 5166) +++ src/mainboard/supermicro/x6dhr_ig/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_WINBOND_W83627HF select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/supermicro/x6dhr_ig/Makefile.inc =================================================================== --- src/mainboard/supermicro/x6dhr_ig/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/x6dhr_ig/Makefile.inc (working copy) @@ -19,6 +19,3 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/supermicro/x6dhr_ig2/Kconfig =================================================================== --- src/mainboard/supermicro/x6dhr_ig2/Kconfig (revision 5166) +++ src/mainboard/supermicro/x6dhr_ig2/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_WINBOND_W83627HF select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/supermicro/x6dhr_ig2/Makefile.inc =================================================================== --- src/mainboard/supermicro/x6dhr_ig2/Makefile.inc (revision 5166) +++ src/mainboard/supermicro/x6dhr_ig2/Makefile.inc (working copy) @@ -19,6 +19,3 @@ ## ROMCCFLAGS=-mcpu=p4 -O2 -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc =================================================================== --- src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc (revision 5166) +++ src/mainboard/soyo/sy-6ba-plus-iii/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/kontron/986lcd-m/Kconfig =================================================================== --- src/mainboard/kontron/986lcd-m/Kconfig (revision 5166) +++ src/mainboard/kontron/986lcd-m/Kconfig (working copy) @@ -9,6 +9,7 @@ select GENERATE_ACPI_TABLES select GENERATE_PIRQ_TABLE select GENERATE_MP_TABLE + select HAVE_HARD_RESET select HAVE_ACPI_RESUME select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT Index: src/mainboard/kontron/986lcd-m/Makefile.inc =================================================================== --- src/mainboard/kontron/986lcd-m/Makefile.inc (revision 5166) +++ src/mainboard/kontron/986lcd-m/Makefile.inc (working copy) @@ -21,20 +21,10 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-y += mainboard.o obj-y += rtl8168.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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o 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 - - - Index: src/mainboard/kontron/kt690/Makefile.inc =================================================================== --- src/mainboard/kontron/kt690/Makefile.inc (revision 5166) +++ src/mainboard/kontron/kt690/Makefile.inc (working copy) @@ -17,18 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/a-trend/atc-6240/Makefile.inc =================================================================== --- src/mainboard/a-trend/atc-6240/Makefile.inc (revision 5166) +++ src/mainboard/a-trend/atc-6240/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/a-trend/atc-6220/Makefile.inc =================================================================== --- src/mainboard/a-trend/atc-6220/Makefile.inc (revision 5166) +++ src/mainboard/a-trend/atc-6220/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/gigabyte/m57sli/Makefile.inc =================================================================== --- src/mainboard/gigabyte/m57sli/Makefile.inc (revision 5166) +++ src/mainboard/gigabyte/m57sli/Makefile.inc (working copy) @@ -17,18 +17,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc =================================================================== --- src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc (revision 5166) +++ src/mainboard/gigabyte/ga_2761gxdk/Makefile.inc (working copy) @@ -17,15 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/gigabyte/ga-6bxc/Makefile.inc =================================================================== --- src/mainboard/gigabyte/ga-6bxc/Makefile.inc (revision 5166) +++ src/mainboard/gigabyte/ga-6bxc/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/digitallogic/msm800sev/Makefile.inc =================================================================== --- src/mainboard/digitallogic/msm800sev/Makefile.inc (revision 5166) +++ src/mainboard/digitallogic/msm800sev/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/digitallogic/adl855pc/Makefile.inc =================================================================== --- src/mainboard/digitallogic/adl855pc/Makefile.inc (revision 5166) +++ src/mainboard/digitallogic/adl855pc/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=p3 -O -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/digitallogic/msm586seg/Makefile.inc =================================================================== --- src/mainboard/digitallogic/msm586seg/Makefile.inc (revision 5166) +++ src/mainboard/digitallogic/msm586seg/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=i386 -O -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/emulation/qemu-x86/Makefile.inc =================================================================== --- src/mainboard/emulation/qemu-x86/Makefile.inc (revision 5166) +++ src/mainboard/emulation/qemu-x86/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=i386 -O -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/mitac/6513wu/Makefile.inc =================================================================== --- src/mainboard/mitac/6513wu/Makefile.inc (revision 5166) +++ src/mainboard/mitac/6513wu/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/olpc/btest/Makefile.inc =================================================================== --- src/mainboard/olpc/btest/Makefile.inc (revision 5166) +++ src/mainboard/olpc/btest/Makefile.inc (working copy) @@ -1,2 +1 @@ ROMCCFLAGS=-mcpu=p2 -O -include $(src)/mainboard/Makefile.romccboard.inc Index: src/mainboard/olpc/rev_a/Makefile.inc =================================================================== --- src/mainboard/olpc/rev_a/Makefile.inc (revision 5166) +++ src/mainboard/olpc/rev_a/Makefile.inc (working copy) @@ -1,2 +1 @@ ROMCCFLAGS=-mcpu=p2 -O -include $(src)/mainboard/Makefile.romccboard.inc Index: src/mainboard/technologic/ts5300/Makefile.inc =================================================================== --- src/mainboard/technologic/ts5300/Makefile.inc (revision 5166) +++ src/mainboard/technologic/ts5300/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=i386 -O -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/amd/pistachio/Makefile.inc =================================================================== --- src/mainboard/amd/pistachio/Makefile.inc (revision 5166) +++ src/mainboard/amd/pistachio/Makefile.inc (working copy) @@ -17,18 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/amd/dbm690t/Makefile.inc =================================================================== --- src/mainboard/amd/dbm690t/Makefile.inc (revision 5166) +++ src/mainboard/amd/dbm690t/Makefile.inc (working copy) @@ -17,19 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - - Index: src/mainboard/amd/rumba/Makefile.inc =================================================================== --- src/mainboard/amd/rumba/Makefile.inc (revision 5166) +++ src/mainboard/amd/rumba/Makefile.inc (working copy) @@ -1 +0,0 @@ -include $(src)/mainboard/Makefile.romccboard.inc Index: src/mainboard/amd/serengeti_cheetah/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah/Makefile.inc (revision 5166) +++ src/mainboard/amd/serengeti_cheetah/Makefile.inc (working copy) @@ -17,12 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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) += ssdt2.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o @@ -31,9 +27,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/amd/norwich/Makefile.inc =================================================================== --- src/mainboard/amd/norwich/Makefile.inc (revision 5166) +++ src/mainboard/amd/norwich/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc =================================================================== --- src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (revision 5166) +++ src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc (working copy) @@ -17,12 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o @@ -34,9 +30,3 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/amd/db800/Makefile.inc =================================================================== --- src/mainboard/amd/db800/Makefile.inc (revision 5166) +++ src/mainboard/amd/db800/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/biostar/m6tba/Makefile.inc =================================================================== --- src/mainboard/biostar/m6tba/Makefile.inc (revision 5166) +++ src/mainboard/biostar/m6tba/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/rca/rm4100/Makefile.inc =================================================================== --- src/mainboard/rca/rm4100/Makefile.inc (revision 5166) +++ src/mainboard/rca/rm4100/Makefile.inc (working copy) @@ -1,4 +1 @@ ROMCCFLAGS=-mcpu=p3 -O - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/nec/powermate2000/Makefile.inc =================================================================== --- src/mainboard/nec/powermate2000/Makefile.inc (revision 5166) +++ src/mainboard/nec/powermate2000/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/azza/pt-6ibd/Makefile.inc =================================================================== --- src/mainboard/azza/pt-6ibd/Makefile.inc (revision 5166) +++ src/mainboard/azza/pt-6ibd/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/iei/nova4899r/Makefile.inc =================================================================== --- src/mainboard/iei/nova4899r/Makefile.inc (revision 5166) +++ src/mainboard/iei/nova4899r/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc =================================================================== --- src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc (revision 5166) +++ src/mainboard/iei/pcisa-lx-800-r10/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/iei/juki-511p/Makefile.inc =================================================================== --- src/mainboard/iei/juki-511p/Makefile.inc (revision 5166) +++ src/mainboard/iei/juki-511p/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/hp/e_vectra_p2706t/Makefile.inc =================================================================== --- src/mainboard/hp/e_vectra_p2706t/Makefile.inc (revision 5166) +++ src/mainboard/hp/e_vectra_p2706t/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/tyan/s2912/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912/Makefile.inc (revision 5166) +++ src/mainboard/tyan/s2912/Makefile.inc (working copy) @@ -17,15 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/tyan/s2850/Kconfig =================================================================== --- src/mainboard/tyan/s2850/Kconfig (revision 5166) +++ src/mainboard/tyan/s2850/Kconfig (working copy) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s2735/Kconfig =================================================================== --- src/mainboard/tyan/s2735/Kconfig (revision 5166) +++ src/mainboard/tyan/s2735/Kconfig (working copy) @@ -6,6 +6,8 @@ select SOUTHBRIDGE_INTEL_I82870 select SOUTHBRIDGE_INTEL_I82801ER select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Index: src/mainboard/tyan/s2735/Makefile.inc =================================================================== --- src/mainboard/tyan/s2735/Makefile.inc (revision 5166) +++ src/mainboard/tyan/s2735/Makefile.inc (working copy) @@ -1,36 +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. -## - -obj-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 - -#obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/tyan/s2880/Kconfig =================================================================== --- src/mainboard/tyan/s2880/Kconfig (revision 5166) +++ src/mainboard/tyan/s2880/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s2881/Kconfig =================================================================== --- src/mainboard/tyan/s2881/Kconfig (revision 5166) +++ src/mainboard/tyan/s2881/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s1846/Makefile.inc =================================================================== --- src/mainboard/tyan/s1846/Makefile.inc (revision 5166) +++ src/mainboard/tyan/s1846/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/tyan/s2891/Kconfig =================================================================== --- src/mainboard/tyan/s2891/Kconfig (revision 5166) +++ src/mainboard/tyan/s2891/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SERIAL_CPU_INIT Index: src/mainboard/tyan/s2882/Kconfig =================================================================== --- src/mainboard/tyan/s2882/Kconfig (revision 5166) +++ src/mainboard/tyan/s2882/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s2892/Kconfig =================================================================== --- src/mainboard/tyan/s2892/Kconfig (revision 5166) +++ src/mainboard/tyan/s2892/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SERIAL_CPU_INIT Index: src/mainboard/tyan/s2875/Kconfig =================================================================== --- src/mainboard/tyan/s2875/Kconfig (revision 5166) +++ src/mainboard/tyan/s2875/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8151 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s2885/Kconfig =================================================================== --- src/mainboard/tyan/s2885/Kconfig (revision 5166) +++ src/mainboard/tyan/s2885/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_AMD_AMD8131 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 Index: src/mainboard/tyan/s2895/Kconfig =================================================================== --- src/mainboard/tyan/s2895/Kconfig (revision 5166) +++ src/mainboard/tyan/s2895/Kconfig (working copy) @@ -7,6 +7,7 @@ select SOUTHBRIDGE_NVIDIA_CK804 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_SMSC_LPC47B397 + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select SERIAL_CPU_INIT Index: src/mainboard/tyan/s2912_fam10/Makefile.inc =================================================================== --- src/mainboard/tyan/s2912_fam10/Makefile.inc (revision 5166) +++ src/mainboard/tyan/s2912_fam10/Makefile.inc (working copy) @@ -17,15 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/pcengines/alix1c/Makefile.inc =================================================================== --- src/mainboard/pcengines/alix1c/Makefile.inc (revision 5166) +++ src/mainboard/pcengines/alix1c/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/artecgroup/dbe61/Makefile.inc =================================================================== --- src/mainboard/artecgroup/dbe61/Makefile.inc (revision 5166) +++ src/mainboard/artecgroup/dbe61/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/asi/mb_5blgp/Makefile.inc =================================================================== --- src/mainboard/asi/mb_5blgp/Makefile.inc (revision 5166) +++ src/mainboard/asi/mb_5blgp/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asi/mb_5blmp/Makefile.inc =================================================================== --- src/mainboard/asi/mb_5blmp/Makefile.inc (revision 5166) +++ src/mainboard/asi/mb_5blmp/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/abit/be6-ii_v2_0/Makefile.inc =================================================================== --- src/mainboard/abit/be6-ii_v2_0/Makefile.inc (revision 5166) +++ src/mainboard/abit/be6-ii_v2_0/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/lippert/roadrunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/roadrunner-lx/Makefile.inc (revision 5166) +++ src/mainboard/lippert/roadrunner-lx/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/lippert/frontrunner/Makefile.inc =================================================================== --- src/mainboard/lippert/frontrunner/Makefile.inc (revision 5166) +++ src/mainboard/lippert/frontrunner/Makefile.inc (working copy) @@ -1,2 +1 @@ ROMCCFLAGS=-mcpu=i386 -O -include $(src)/mainboard/Makefile.romccboard.inc Index: src/mainboard/lippert/spacerunner-lx/Makefile.inc =================================================================== --- src/mainboard/lippert/spacerunner-lx/Makefile.inc (revision 5166) +++ src/mainboard/lippert/spacerunner-lx/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -obj-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/via/epia-m700/Makefile.inc =================================================================== --- src/mainboard/via/epia-m700/Makefile.inc (revision 5166) +++ src/mainboard/via/epia-m700/Makefile.inc (working copy) @@ -19,15 +19,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -initobj-y += crt0.o -obj-y += mainboard.o obj-y += wakeup.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 - - - Index: src/mainboard/via/vt8454c/Kconfig =================================================================== --- src/mainboard/via/vt8454c/Kconfig (revision 5166) +++ src/mainboard/via/vt8454c/Kconfig (working copy) @@ -8,6 +8,7 @@ select HAVE_MP_TABLE # select MMCONF_SUPPORT select USE_PRINTK_IN_CAR + select HAVE_HARD_RESET select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 select USE_DCACHE_RAM Index: src/mainboard/via/vt8454c/Makefile.inc =================================================================== --- src/mainboard/via/vt8454c/Makefile.inc (revision 5166) +++ src/mainboard/via/vt8454c/Makefile.inc (working copy) @@ -17,14 +17,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += mainboard.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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -initobj-y += crt0.o - - Index: src/mainboard/via/epia-m/Makefile.inc =================================================================== --- src/mainboard/via/epia-m/Makefile.inc (revision 5166) +++ src/mainboard/via/epia-m/Makefile.inc (working copy) @@ -19,14 +19,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -initobj-y += crt0.o -obj-y += mainboard.o obj-y += vgabios.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - - - Index: src/mainboard/via/epia-n/Makefile.inc =================================================================== --- src/mainboard/via/epia-n/Makefile.inc (revision 5166) +++ src/mainboard/via/epia-n/Makefile.inc (working copy) @@ -19,13 +19,5 @@ ## 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) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - - - Index: src/mainboard/via/epia-cn/Makefile.inc =================================================================== --- src/mainboard/via/epia-cn/Makefile.inc (revision 5166) +++ src/mainboard/via/epia-cn/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=c3 -O -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/via/epia/Makefile.inc =================================================================== --- src/mainboard/via/epia/Makefile.inc (revision 5166) +++ src/mainboard/via/epia/Makefile.inc (working copy) @@ -1,27 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2008 VIA Technologies, Inc. -## (Written by Aaron Lwe 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 - - - Index: src/mainboard/via/pc2500e/Makefile.inc =================================================================== --- src/mainboard/via/pc2500e/Makefile.inc (revision 5166) +++ src/mainboard/via/pc2500e/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS ?= -mcpu=c3 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/dell/s1850/Kconfig =================================================================== --- src/mainboard/dell/s1850/Kconfig (revision 5166) +++ src/mainboard/dell/s1850/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_NSC_PC8374 select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_1024 Index: src/mainboard/dell/s1850/Makefile.inc =================================================================== --- src/mainboard/dell/s1850/Makefile.inc (revision 5166) +++ src/mainboard/dell/s1850/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=p4 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc =================================================================== --- src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc (revision 5166) +++ src/mainboard/compaq/deskpro_en_sff_p600/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/roda/rk886ex/Makefile.inc =================================================================== --- src/mainboard/roda/rk886ex/Makefile.inc (revision 5166) +++ src/mainboard/roda/rk886ex/Makefile.inc (working copy) @@ -21,21 +21,12 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-y += mainboard.o obj-y += m3885.o obj-y += ec.o obj-y += rtl8168.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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o 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 - - Index: src/mainboard/msi/ms7135/Kconfig =================================================================== --- src/mainboard/msi/ms7135/Kconfig (revision 5166) +++ src/mainboard/msi/ms7135/Kconfig (working copy) @@ -6,6 +6,7 @@ select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_CK804 select SUPERIO_WINBOND_W83627THF + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_DCACHE_RAM Index: src/mainboard/msi/ms6119/Makefile.inc =================================================================== --- src/mainboard/msi/ms6119/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms6119/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/msi/ms6147/Makefile.inc =================================================================== --- src/mainboard/msi/ms6147/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms6147/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/msi/ms6156/Makefile.inc =================================================================== --- src/mainboard/msi/ms6156/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms6156/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/msi/ms9282/Makefile.inc =================================================================== --- src/mainboard/msi/ms9282/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms9282/Makefile.inc (working copy) @@ -17,17 +17,10 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += mainboard.o obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o obj-y += ../../../drivers/i2c/adm1027/adm1027.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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/msi/ms6178/Makefile.inc =================================================================== --- src/mainboard/msi/ms6178/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms6178/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/msi/ms7260/Makefile.inc =================================================================== --- src/mainboard/msi/ms7260/Makefile.inc (revision 5166) +++ src/mainboard/msi/ms7260/Makefile.inc (working copy) @@ -17,15 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/Makefile.k8_CAR.inc =================================================================== --- src/mainboard/Makefile.k8_CAR.inc (revision 5166) +++ src/mainboard/Makefile.k8_CAR.inc (working copy) @@ -23,15 +23,10 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-y += mainboard.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 -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o Index: src/mainboard/advantech/pcm-5820/Makefile.inc =================================================================== --- src/mainboard/advantech/pcm-5820/Makefile.inc (revision 5166) +++ src/mainboard/advantech/pcm-5820/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/eaglelion/5bcm/Makefile.inc =================================================================== --- src/mainboard/eaglelion/5bcm/Makefile.inc (revision 5166) +++ src/mainboard/eaglelion/5bcm/Makefile.inc (working copy) @@ -19,5 +19,3 @@ ## ROMCCFLAGS := -mcpu=i386 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/Makefile.romccboard.inc =================================================================== --- src/mainboard/Makefile.romccboard.inc (revision 5166) +++ src/mainboard/Makefile.romccboard.inc (working copy) @@ -1,29 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2009 Uwe Hermann -## Copyright (C) 2010 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; 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_MP_TABLE) += mptable.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o - Index: src/mainboard/jetway/j7f24/Makefile.inc =================================================================== --- src/mainboard/jetway/j7f24/Makefile.inc (revision 5166) +++ src/mainboard/jetway/j7f24/Makefile.inc (working copy) @@ -1,28 +0,0 @@ -## -## This file is part of the coreboot project. -## -## Copyright (C) 2008 VIA Technologies, Inc. -## (Written by Aaron Lwe 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 - - - Index: src/mainboard/technexion/tim8690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim8690/Makefile.inc (revision 5166) +++ src/mainboard/technexion/tim8690/Makefile.inc (working copy) @@ -17,18 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/technexion/tim5690/Makefile.inc =================================================================== --- src/mainboard/technexion/tim5690/Makefile.inc (revision 5166) +++ src/mainboard/technexion/tim5690/Makefile.inc (working copy) @@ -17,12 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o @@ -32,9 +28,3 @@ obj-y += speaker.o obj-y += vgabios.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/winent/pl6064/Makefile.inc =================================================================== --- src/mainboard/winent/pl6064/Makefile.inc (revision 5166) +++ src/mainboard/winent/pl6064/Makefile.inc (working copy) @@ -1,10 +0,0 @@ -driver-y += mainboard.o - -# Needed by irq_tables and mptable and acpi_tables. -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/nvidia/l1_2pvv/Makefile.inc =================================================================== --- src/mainboard/nvidia/l1_2pvv/Makefile.inc (revision 5166) +++ src/mainboard/nvidia/l1_2pvv/Makefile.inc (working copy) @@ -17,15 +17,7 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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_USE_INIT) += romstage.o obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o - -# This is part of the conversion to init-obj and away from included code. -initobj-y += crt0.o - Index: src/mainboard/intel/xe7501devkit/Kconfig =================================================================== --- src/mainboard/intel/xe7501devkit/Kconfig (revision 5166) +++ src/mainboard/intel/xe7501devkit/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_I82801CA select SUPERIO_SMSC_LPC47B272 select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Index: src/mainboard/intel/xe7501devkit/Makefile.inc =================================================================== --- src/mainboard/intel/xe7501devkit/Makefile.inc (revision 5166) +++ src/mainboard/intel/xe7501devkit/Makefile.inc (working copy) @@ -1,5 +1,2 @@ ROMCCFLAGS := -mcpu=p4 -O2 obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/intel/d945gclf/Kconfig =================================================================== --- src/mainboard/intel/d945gclf/Kconfig (revision 5166) +++ src/mainboard/intel/d945gclf/Kconfig (working copy) @@ -25,6 +25,7 @@ select NORTHBRIDGE_INTEL_I945 select SOUTHBRIDGE_INTEL_I82801GX select SUPERIO_SMSC_LPC47M15X + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select HAVE_ACPI_TABLES Index: src/mainboard/intel/d945gclf/Makefile.inc =================================================================== --- src/mainboard/intel/d945gclf/Makefile.inc (revision 5166) +++ src/mainboard/intel/d945gclf/Makefile.inc (working copy) @@ -21,19 +21,10 @@ ## This mainboard requires DCACHE_AS_RAM enabled. It won't work without. ## -obj-y += mainboard.o obj-y += rtl8168.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 obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o 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 - - Index: src/mainboard/intel/truxton/Kconfig =================================================================== --- src/mainboard/intel/truxton/Kconfig (revision 5166) +++ src/mainboard/intel/truxton/Kconfig (working copy) @@ -7,6 +7,7 @@ select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO select ROMCC + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Index: src/mainboard/intel/truxton/Makefile.inc =================================================================== --- src/mainboard/intel/truxton/Makefile.inc (revision 5166) +++ src/mainboard/intel/truxton/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=p4 -fno-simplify-phi -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/intel/mtarvon/Kconfig =================================================================== --- src/mainboard/intel/mtarvon/Kconfig (revision 5166) +++ src/mainboard/intel/mtarvon/Kconfig (working copy) @@ -6,6 +6,7 @@ select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 select ROMCC + select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Index: src/mainboard/intel/mtarvon/Makefile.inc =================================================================== --- src/mainboard/intel/mtarvon/Makefile.inc (revision 5166) +++ src/mainboard/intel/mtarvon/Makefile.inc (working copy) @@ -1,3 +1 @@ ROMCCFLAGS := -mcpu=p4 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/intel/eagleheights/Kconfig =================================================================== --- src/mainboard/intel/eagleheights/Kconfig (revision 5166) +++ src/mainboard/intel/eagleheights/Kconfig (working copy) @@ -6,6 +6,8 @@ select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select MMCONF_SUPPORT Index: src/mainboard/intel/eagleheights/Makefile.inc =================================================================== --- src/mainboard/intel/eagleheights/Makefile.inc (revision 5166) +++ src/mainboard/intel/eagleheights/Makefile.inc (working copy) @@ -1,14 +1,3 @@ -obj-y += mainboard.o -obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o -obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o -# Use Intel Core (not Core 2) code for CAR init, any CPU might be used. - - Index: src/mainboard/intel/jarrell/Kconfig =================================================================== --- src/mainboard/intel/jarrell/Kconfig (revision 5166) +++ src/mainboard/intel/jarrell/Kconfig (working copy) @@ -7,6 +7,8 @@ select SOUTHBRIDGE_INTEL_I82801ER select SUPERIO_NSC_PC87427 select ROMCC + select HAVE_HARD_RESET + select BOARD_HAS_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select UDELAY_TSC Index: src/mainboard/intel/jarrell/Makefile.inc =================================================================== --- src/mainboard/intel/jarrell/Makefile.inc (revision 5166) +++ src/mainboard/intel/jarrell/Makefile.inc (working copy) @@ -1,4 +1 @@ -obj-$(CONFIG_HAVE_HARD_RESET) += reset.o ROMCCFLAGS := -mcpu=p4 -O2 -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/mew-am/Makefile.inc =================================================================== --- src/mainboard/asus/mew-am/Makefile.inc (revision 5166) +++ src/mainboard/asus/mew-am/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/p2b/Makefile.inc =================================================================== --- src/mainboard/asus/p2b/Makefile.inc (revision 5166) +++ src/mainboard/asus/p2b/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/p2b-d/Makefile.inc =================================================================== --- src/mainboard/asus/p2b-d/Makefile.inc (revision 5166) +++ src/mainboard/asus/p2b-d/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/p2b-f/Makefile.inc =================================================================== --- src/mainboard/asus/p2b-f/Makefile.inc (revision 5166) +++ src/mainboard/asus/p2b-f/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/a8v-e_se/Makefile.inc =================================================================== --- src/mainboard/asus/a8v-e_se/Makefile.inc (revision 5166) +++ src/mainboard/asus/a8v-e_se/Makefile.inc (working copy) @@ -1,13 +1,3 @@ -obj-y += mainboard.o - # Needed by irq_tables and mptable and acpi_tables. -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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/asus/p2b-ds/Makefile.inc =================================================================== --- src/mainboard/asus/p2b-ds/Makefile.inc (revision 5166) +++ src/mainboard/asus/p2b-ds/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/p3b-f/Makefile.inc =================================================================== --- src/mainboard/asus/p3b-f/Makefile.inc (revision 5166) +++ src/mainboard/asus/p3b-f/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/mew-vm/Makefile.inc =================================================================== --- src/mainboard/asus/mew-vm/Makefile.inc (revision 5166) +++ src/mainboard/asus/mew-vm/Makefile.inc (working copy) @@ -1,22 +0,0 @@ -## -## 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 -## - -include $(src)/mainboard/Makefile.romccboard.inc - Index: src/mainboard/asus/a8n_e/Makefile.inc =================================================================== --- src/mainboard/asus/a8n_e/Makefile.inc (revision 5166) +++ src/mainboard/asus/a8n_e/Makefile.inc (working copy) @@ -17,15 +17,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-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 - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/mainboard/asus/m2v-mx_se/Makefile.inc =================================================================== --- src/mainboard/asus/m2v-mx_se/Makefile.inc (revision 5166) +++ src/mainboard/asus/m2v-mx_se/Makefile.inc (working copy) @@ -18,14 +18,6 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -obj-y += mainboard.o - #needed by irq_tables and mptable and acpi_tables obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o - -# This is part of the conversion to init-obj and away from included code. - -initobj-y += crt0.o - - Index: src/arch/i386/Makefile.inc =================================================================== --- src/arch/i386/Makefile.inc (revision 5166) +++ src/arch/i386/Makefile.inc (working copy) @@ -197,8 +197,25 @@ mv $@.tmp $@ rm -f $@.tmp1 endif + +else +# Only in first pass + +# Things that appear in every board +initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o +objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o +ifeq ($(CONFIG_GENERATE_MP_TABLE),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o endif +ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o +endif +ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y) +objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o +endif +endif + ifeq ($(CONFIG_TINY_BOOTBLOCK),y) include $(src)/arch/i386/Makefile.bootblock.inc else Index: Makefile =================================================================== --- Makefile (revision 5166) +++ Makefile (working copy) @@ -119,7 +119,7 @@ crt0s:= ldscripts:= types:=obj initobj driver smmobj -includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y)))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) +includemakefiles=$(foreach type,$(2), $(eval $(type)-y:=)) $(eval subdirs-y:=) $(eval -include $(1)) $(if $(strip $(3)),$(foreach type,$(2),$(eval $(type)s+=$$(patsubst src/%,$(obj)/%,$$(addprefix $(dir $(1)),$$($(type)-y)))))) $(eval subdirs+=$$(subst $(PWD)/,,$$(abspath $$(addprefix $(dir $(1)),$$(subdirs-y))))) evaluate_subdirs=$(eval cursubdirs:=$(subdirs)) $(eval subdirs:=) $(foreach dir,$(cursubdirs),$(eval $(call includemakefiles,$(dir)/Makefile.inc,$(types),$(1)))) $(if $(subdirs),$(eval $(call evaluate_subdirs, $(1)))) # collect all object files eligible for building