diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-03-01 07:42:02 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-03-01 07:42:02 +0000 |
| commit | 75bf053fd65bd962fe7a144eb4956f47d9e43d35 (patch) | |
| tree | d395a203f327ee15ef3eaa86dbf68873c0ac6184 /src/mainboard/amd | |
| parent | 806a29eb1909cc4df0fb4bdb0f25083976c3ea6c (diff) | |
- 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
Diffstat (limited to 'src/mainboard/amd')
4 files changed, 2 insertions, 15 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 84ef6765a7..28146549b1 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -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 diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index f2b4800966..8f4424e622 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 075ef91fd3..f74e40c577 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -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 diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc index a0339ee84b..78e805d268 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc @@ -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 |