===================================================================
@@ -186,6 +186,21 @@
This variable specifies whether a given board has a reset.c
file containing a hard_reset() function.
+config BOARD_HAS_FADT
+ bool
+ default n
+ help
+ This variable specifies whether a given board has a board-local
+ FADT in fadt.c. Long-term, those should be moved to appropriate
+ chipset components (eg. southbridge)
+
+config HAVE_BUS_CONFIG
+ bool
+ default n
+ help
+ This variable specifies whether a given board has a get_bus_conf.c
+ file containing bus configuration data.
+
config HAVE_INIT_TIMER
bool
default n if UDELAY_IO
===================================================================
@@ -1,35 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-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; 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.
-##
-
-
-#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
-
-
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_AMD8111
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,11 +18,7 @@
##
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt5.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1,24 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2008 VIA Technologies, Inc.
-## (Written by Aaron Lwe <aaron.lwe@gmail.com> for VIA)
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_BROADCOM_BCM5780
select SOUTHBRIDGE_BROADCOM_BCM5785
select SUPERIO_NSC_PC87417
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,6 +1,4 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,21 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -20,4 +20,3 @@
obj-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,21 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_AMD_AMD8132
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,21 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_INTEL_I945
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_WINBOND_W83627THG
+ select BOARD_HAS_FADT
select GENERATE_ACPI_TABLES
select GENERATE_PIRQ_TABLE
select GENERATE_MP_TABLE
===================================================================
@@ -23,8 +23,5 @@
obj-y += rtl8168.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
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_RS690
select SOUTHBRIDGE_AMD_SB600
select SUPERIO_WINBOND_W83627DHG
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
===================================================================
@@ -1,24 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_ITE_IT8716F
select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,9 +18,6 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.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
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_SIS_SIS966
select SUPERIO_ITE_IT8716F
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
===================================================================
@@ -18,6 +18,5 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -6,6 +6,8 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_AMD_RS690
select SOUTHBRIDGE_AMD_SB600
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,24 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -7,10 +7,12 @@
select SOUTHBRIDGE_AMD_RS690
select SOUTHBRIDGE_AMD_SB600
select SUPERIO_ITE_IT8712F
+ select BOARD_HAS_FADT
select GENERATE_ACPI_TABLES
select GENERATE_MP_TABLE
select GENERATE_PIRQ_TABLE
select HAVE_MAINBOARD_RESOURCES
+ select HAVE_BUS_CONFIG
select USE_PRINTK_IN_CAR
select USE_DCACHE_RAM
select HAVE_HARD_RESET
===================================================================
@@ -1,24 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_AMD8111
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,12 +18,8 @@
##
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_AMD8111
select SOUTHBRIDGE_AMD_AMD8132
select SUPERIO_WINBOND_W83627HF
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,10 +18,6 @@
##
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
# ./ssdt.o is in northbridge/amd/amdfam10/Makefile.inc
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt2.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_BROADCOM_BCM21000
select SOUTHBRIDGE_BROADCOM_BCM5785
select SUPERIO_NSC_PC87417
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,4 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,6 +18,5 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1,3 +1 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
-obj-y += get_bus_conf.o
obj-y += ../../../drivers/i2c/adm1027/adm1027.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1,3 +1,2 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
obj-y += ../../../drivers/i2c/adm1027/adm1027.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_AMD_AMD8131
select SOUTHBRIDGE_AMD_AMD8111
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1,2 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
-obj-y += get_bus_conf.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_NVIDIA_CK804
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_SMSC_LPC47B397
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627HF
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,6 +18,5 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -4,6 +4,7 @@
select CPU_VIA_C7
select NORTHBRIDGE_VIA_VX800
select SUPERIO_WINBOND_W83697HF
+ select BOARD_HAS_FADT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
===================================================================
@@ -21,6 +21,3 @@
obj-y += wakeup.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -4,6 +4,7 @@
select CPU_VIA_C7
select NORTHBRIDGE_VIA_CX700
select SUPERIO_VIA_VT1211
+ select BOARD_HAS_FADT
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
# select MMCONF_SUPPORT
===================================================================
@@ -1,22 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-2009 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
-##
-
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -6,6 +6,7 @@
select SOUTHBRIDGE_VIA_VT8235
select SOUTHBRIDGE_RICOH_RL5C476
select SUPERIO_VIA_VT1211
+ select BOARD_HAS_FADT
select HAVE_PIRQ_TABLE
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_256
===================================================================
@@ -21,6 +21,3 @@
obj-y += vgabios.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -5,6 +5,7 @@
select NORTHBRIDGE_VIA_CN400
select SOUTHBRIDGE_VIA_VT8237R
select SUPERIO_WINBOND_W83697HF
+ select BOARD_HAS_FADT
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select EPIA_VT8237R_INIT
===================================================================
@@ -1,23 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2008 VIA Technologies, Inc.
-## (Written by Aaron Lwe <aaron.lwe@gmail.com> for VIA)
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -8,6 +8,7 @@
select SOUTHBRIDGE_TI_PCI7420
select SUPERIO_SMSC_LPC47N227
select SUPERIO_RENESAS_M3885X
+ select BOARD_HAS_FADT
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select MMCONF_SUPPORT
===================================================================
@@ -25,8 +25,5 @@
obj-y += ec.o
obj-y += rtl8168.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
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_CK804
select SUPERIO_WINBOND_W83627THF
+ select HAVE_BUS_CONFIG
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_ck804.inc
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627EHG
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -21,6 +21,5 @@
obj-y += ../../../drivers/i2c/adm1027/adm1027.o
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -7,6 +7,7 @@
select SOUTHBRIDGE_BROADCOM_BCM5780
select SOUTHBRIDGE_BROADCOM_BCM5785
select SUPERIO_NSC_PC87417
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,3 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
-
-obj-y += get_bus_conf.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627EHG
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,6 +18,5 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1,32 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-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; 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-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-
-
-
-
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_CK804
select SUPERIO_SMSC_LPC47M10X
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,3 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
-
-obj-y += get_bus_conf.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_RS690
select SOUTHBRIDGE_AMD_SB600
select SUPERIO_ITE_IT8712F
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,24 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
===================================================================
@@ -7,6 +7,8 @@
select SOUTHBRIDGE_AMD_RS690
select SOUTHBRIDGE_AMD_SB600
select SUPERIO_ITE_IT8712F
+ select BOARD_HAS_FADT
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,10 +18,6 @@
##
# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.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 debug message for products of Technexion.
obj-y += tn_post_code.o
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -1 +0,0 @@
-include $(src)/mainboard/Makefile.k8_CAR.inc
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_MCP55
select SUPERIO_WINBOND_W83627EHG
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -18,6 +18,5 @@
##
#needed by irq_tables and mptable and acpi_tables
-obj-y += get_bus_conf.o
obj-$(CONFIG_USE_INIT) += romstage.o
obj-$(CONFIG_AP_CODE_IN_CAR) += ap_romstage.o
===================================================================
@@ -1,2 +1 @@
ROMCCFLAGS := -mcpu=p4 -O2
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -0,0 +1,16 @@
+/* This is a dummy dsdt. Normal ACPI requires a DSDT, but in this case, ACPI
+ is just a workaround for QNX. It would be nice to eventually have a real
+ dsdt here.
+ Note: It will not be hooked up at runtime. It won't even get linked.
+ But we still need this file. */
+
+DefinitionBlock(
+ "dsdt.aml",
+ "DSDT",
+ 0x02, // DSDT revision: ACPI v2.0
+ "COREv2", // OEM id
+ "COREBOOT", // OEM table id
+ 0x20090419 // OEM revision
+)
+{
+}
===================================================================
@@ -25,6 +25,7 @@
select NORTHBRIDGE_INTEL_I945
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_SMSC_LPC47M15X
+ select BOARD_HAS_FADT
select HAVE_HARD_RESET
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
===================================================================
@@ -23,8 +23,5 @@
obj-y += rtl8168.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
===================================================================
@@ -8,6 +8,7 @@
select SUPERIO_SMSC_SMSCSUPERIO
select HAVE_HARD_RESET
select BOARD_HAS_HARD_RESET
+ select BOARD_HAS_FADT
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select MMCONF_SUPPORT
===================================================================
@@ -1,3 +0,0 @@
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
===================================================================
@@ -1,3 +0,0 @@
-# Needed by irq_tables and mptable and acpi_tables.
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -6,6 +6,7 @@
select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX
select SOUTHBRIDGE_NVIDIA_CK804
select SUPERIO_ITE_IT8712F
+ select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
select USE_PRINTK_IN_CAR
===================================================================
@@ -1,21 +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
-##
-
-# Needed by irq_tables and mptable and acpi_tables.
-obj-y += get_bus_conf.o
===================================================================
@@ -1,23 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2007-2008 coresystems GmbH
-## Copyright (C) 2009 Cristi Măgherușan <cristi.magherusan@net.utcluj.ro>
-##
-## 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
-##
-
-#needed by irq_tables and mptable and acpi_tables
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o
-obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
===================================================================
@@ -213,9 +213,20 @@
ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y)
objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o
endif
+ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o
+ifeq ($(CONFIG_BOARD_HAS_FADT),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o
+endif
+endif
+ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
+objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o
endif
+endif
+
ifeq ($(CONFIG_TINY_BOOTBLOCK),y)
include $(src)/arch/i386/Makefile.bootblock.inc
else
===================================================================
@@ -142,7 +142,7 @@
$(eval $(call evaluate_subdirs))
-define objs_dsl_template
+define objs_asl_template
$(obj)/$(1)%.o: src/$(1)%.asl
@printf " IASL $$(subst $(top)/,,$$(@))\n"
$(CPP) -D__ACPI__ -P $(CPPFLAGS) -include $(obj)/config.h -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
@@ -201,7 +201,7 @@
usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
usetemplate=$(foreach d,$(sort $(dir $($(1)))),$(eval $(call $(1)_$(2)_template,$(subst $(obj)/,,$(d)))))
-$(eval $(call usetemplate,objs,dsl))
+$(eval $(call usetemplate,objs,asl))
$(eval $(call usetemplate,objs,c))
$(eval $(call usetemplate,objs,S))
$(eval $(call usetemplate,initobjs,c))
Hi, I'm seeing the end of this, but not yet: After this patch, ROMCCFLAGS and the SSDT rules for ACPI are left for unification. Patch changes: - Adds config flag for boards that have their own fadt.c This should eventually go, as fadt seems to be better put into the southbridge - Add config flag for boards that have get_bus_conf.c Might be cleaned out as well, no idea - Use flags where appropriate. - Move the following rules to src/arch/i386/Makefile.inc: - fadt.o - dsdt.o - acpi_tables.o - get_bus_conf.o - Rename objs_dsl_template in toplevel Makefile to the more appropriate objs_asl_template - Removes all Makefiles that are empty now, which includes src/mainboard/Makefile.k8_CAR.inc and src/mainboard/Makefile.k8_ck804.inc and the include statements that used these files. One workaround I had to add: intel/xe7501devkit uses ACPI in an unusual way: It adds a MADT, but no DSDT. As this is highly unusual, I didn't want to add explicit support for that scenario (and encourage such uses that way), and added a dummy dsdt.asl instead. It will be linked to dsdt.o, but not linked into the final binary. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>