From 37bdb87fab34f772d17c694d3969fd177c4adf57 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 27 Feb 2010 08:39:04 +0000 Subject: - make HAVE_HARD_RESET match what newconfig did - introduce BOARD_HAS_HARD_RESET and use it if a board provides hard_reset in $(MAINBOARDDIR)/reset.c, instead of some chipset component - move a couple of rules out of the mainboards' Makefiles into src/arch/i386/Makefile.inc: 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_BOARD_HAS_HARD_RESET) += reset.o - remove Makefile.incs that are empty (or comment-only) after these changes, incl. Makefile.romccboard.inc (and references to it) - Make include not fail if Makefile.inc doesn't exist. Signed-off-by: Patrick Georgi Acked-by: Myles Watson Acked-by: Peter Stuge Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5168 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/a8n_e/Makefile.inc | 10 ---------- src/mainboard/asus/a8v-e_se/Makefile.inc | 10 ---------- src/mainboard/asus/m2v-mx_se/Makefile.inc | 8 -------- src/mainboard/asus/mew-am/Makefile.inc | 22 ---------------------- src/mainboard/asus/mew-vm/Makefile.inc | 22 ---------------------- src/mainboard/asus/p2b-d/Makefile.inc | 22 ---------------------- src/mainboard/asus/p2b-ds/Makefile.inc | 22 ---------------------- src/mainboard/asus/p2b-f/Makefile.inc | 22 ---------------------- src/mainboard/asus/p2b/Makefile.inc | 22 ---------------------- src/mainboard/asus/p3b-f/Makefile.inc | 22 ---------------------- 10 files changed, 182 deletions(-) delete mode 100644 src/mainboard/asus/mew-am/Makefile.inc delete mode 100644 src/mainboard/asus/mew-vm/Makefile.inc delete mode 100644 src/mainboard/asus/p2b-d/Makefile.inc delete mode 100644 src/mainboard/asus/p2b-ds/Makefile.inc delete mode 100644 src/mainboard/asus/p2b-f/Makefile.inc delete mode 100644 src/mainboard/asus/p2b/Makefile.inc delete mode 100644 src/mainboard/asus/p3b-f/Makefile.inc (limited to 'src/mainboard/asus') diff --git a/src/mainboard/asus/a8n_e/Makefile.inc b/src/mainboard/asus/a8n_e/Makefile.inc index 9b21a30295..5b1a13c211 100644 --- a/src/mainboard/asus/a8n_e/Makefile.inc +++ b/src/mainboard/asus/a8n_e/Makefile.inc @@ -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 - - diff --git a/src/mainboard/asus/a8v-e_se/Makefile.inc b/src/mainboard/asus/a8v-e_se/Makefile.inc index 2422d4bfa9..ceff472b03 100644 --- a/src/mainboard/asus/a8v-e_se/Makefile.inc +++ b/src/mainboard/asus/a8v-e_se/Makefile.inc @@ -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 - - diff --git a/src/mainboard/asus/m2v-mx_se/Makefile.inc b/src/mainboard/asus/m2v-mx_se/Makefile.inc index 9af0a377ab..bd6760a8bf 100644 --- a/src/mainboard/asus/m2v-mx_se/Makefile.inc +++ b/src/mainboard/asus/m2v-mx_se/Makefile.inc @@ -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 - - diff --git a/src/mainboard/asus/mew-am/Makefile.inc b/src/mainboard/asus/mew-am/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/mew-am/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/mew-vm/Makefile.inc b/src/mainboard/asus/mew-vm/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/mew-vm/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/p2b-d/Makefile.inc b/src/mainboard/asus/p2b-d/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/p2b-d/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/p2b-ds/Makefile.inc b/src/mainboard/asus/p2b-ds/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/p2b-ds/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/p2b-f/Makefile.inc b/src/mainboard/asus/p2b-f/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/p2b-f/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/p2b/Makefile.inc b/src/mainboard/asus/p2b/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/p2b/Makefile.inc +++ /dev/null @@ -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 - diff --git a/src/mainboard/asus/p3b-f/Makefile.inc b/src/mainboard/asus/p3b-f/Makefile.inc deleted file mode 100644 index caa81b8b4e..0000000000 --- a/src/mainboard/asus/p3b-f/Makefile.inc +++ /dev/null @@ -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 - -- cgit v1.2.3