GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add rules that build either 4 or 5 ssdts (only those variants exist in the board now) 

- Change ACPI_SSDTX_NUM to either 4 or 5 for boards that have ssdtX.asl
  files, according to the number of ssdtX.asl there.
- Remove custom ssdt rules

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5176 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2010-03-01 07:42:02 +00:00
parent 806a29eb19
commit 75bf053fd6
9 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/arch/i386/Makefile.inc
View File

@ -202,6 +202,15 @@ endif
ifeq ($(CONFIG_GENERATE_ACPI_TABLES),y)
objs += $(obj)/mainboard/$(MAINBOARDDIR)/acpi_tables.o
objs += $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o
# make doesn't have arithmetic operators or greater-than comparisons
ifeq ($(subst 5,4,$(CONFIG_ACPI_SSDTX_NUM)),4)
objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt2.o
objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt3.o
objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt4.o
endif
ifeq ($(CONFIG_ACPI_SSDTX_NUM),5)
objs += $(obj)/mainboard/$(MAINBOARDDIR)/ssdt5.o
endif
ifeq ($(CONFIG_BOARD_HAS_FADT),y)
objs += $(obj)/mainboard/$(MAINBOARDDIR)/fadt.o
endif

2
src/mainboard/amd/serengeti_cheetah/Kconfig
View File

@ -128,5 +128,5 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
config ACPI_SSDTX_NUM
int
default 1
default 4
depends on BOARD_AMD_SERENGETI_CHEETAH

5
src/mainboard/amd/serengeti_cheetah/Makefile.inc
View File

@ -17,9 +17,4 @@
## 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) += ssdt2.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt3.o
obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt4.o
obj-y += ../../../drivers/i2c/i2cmux/i2cmux.o

2
src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
View File

@ -116,7 +116,7 @@ config HEAP_SIZE
config ACPI_SSDTX_NUM
int
default 31
default 5
depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID

8
src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
View File

@ -17,12 +17,4 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
# Needed by irq_tables and mptable and acpi_tables.
# ./ssdt.o is in northbridge/amd/amdfam10/Makefile.inc
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-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o

2
src/mainboard/iwill/dk8_htx/Kconfig
View File

@ -122,5 +122,5 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
config ACPI_SSDTX_NUM
int
default 3
default 5
depends on BOARD_IWILL_DK8_HTX

24
src/mainboard/iwill/dk8_htx/Makefile.inc
View File

@ -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-$(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

5
src/mainboard/tyan/s2912/Kconfig
View File

@ -140,8 +140,3 @@ config IRQ_SLOT_COUNT
int
default 11
depends on BOARD_TYAN_S2912
config ACPI_SSDTX_NUM
int
default 3
depends on BOARD_TYAN_S2912

5
src/mainboard/tyan/s2912_fam10/Kconfig
View File

@ -153,11 +153,6 @@ config SERIAL_CPU_INIT
default n
depends on BOARD_TYAN_S2912_FAM10
config ACPI_SSDTX_NUM
int
default 31
depends on BOARD_TYAN_S2912_FAM10
config RAMBASE
hex
default 0x200000