[coreboot] [commit] r5176 - in trunk/src: arch/i386 mainboard/amd/serengeti_cheetah mainboard/amd/serengeti_cheetah_fam10 mainboard/iwill/dk8_htx mainboard/tyan/s2912 mainboard/tyan/s2912_fam10
repository service
svn at coreboot.org
Mon Mar 1 08:42:02 CET 2010
Author: oxygene
Date: Mon Mar 1 08:42:02 2010
New Revision: 5176
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5176
Log:
- 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 at coresystems.de>
Acked-by: Peter Stuge <peter at stuge.se>
Deleted:
trunk/src/mainboard/iwill/dk8_htx/Makefile.inc
Modified:
trunk/src/arch/i386/Makefile.inc
trunk/src/mainboard/amd/serengeti_cheetah/Kconfig
trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc
trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
trunk/src/mainboard/iwill/dk8_htx/Kconfig
trunk/src/mainboard/tyan/s2912/Kconfig
trunk/src/mainboard/tyan/s2912_fam10/Kconfig
Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/arch/i386/Makefile.inc Mon Mar 1 08:42:02 2010 (r5176)
@@ -202,6 +202,15 @@
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
Modified: trunk/src/mainboard/amd/serengeti_cheetah/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Mon Mar 1 08:42:02 2010 (r5176)
@@ -128,5 +128,5 @@
config ACPI_SSDTX_NUM
int
- default 1
+ default 4
depends on BOARD_AMD_SERENGETI_CHEETAH
Modified: trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/amd/serengeti_cheetah/Makefile.inc Mon Mar 1 08:42:02 2010 (r5176)
@@ -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
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Mar 1 08:42:02 2010 (r5176)
@@ -116,7 +116,7 @@
config ACPI_SSDTX_NUM
int
- default 31
+ default 5
depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10
config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Makefile.inc Mon Mar 1 08:42:02 2010 (r5176)
@@ -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
Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/Kconfig Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Mon Mar 1 08:42:02 2010 (r5176)
@@ -122,5 +122,5 @@
config ACPI_SSDTX_NUM
int
- default 3
+ default 5
depends on BOARD_IWILL_DK8_HTX
Modified: trunk/src/mainboard/tyan/s2912/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2912/Kconfig Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/tyan/s2912/Kconfig Mon Mar 1 08:42:02 2010 (r5176)
@@ -140,8 +140,3 @@
int
default 11
depends on BOARD_TYAN_S2912
-
-config ACPI_SSDTX_NUM
- int
- default 3
- depends on BOARD_TYAN_S2912
Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2912_fam10/Kconfig Sun Feb 28 21:56:42 2010 (r5175)
+++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig Mon Mar 1 08:42:02 2010 (r5176)
@@ -153,11 +153,6 @@
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
More information about the coreboot
mailing list