summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2010-11-05 16:17:46 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-11-05 16:17:46 +0000
commitd51122df4e0bb23758a497268efaccc4fc1ddd75 (patch)
treed8fa4ebd30b83c5d2adf1681d75e9c386fdd4b85 /src/mainboard
parentadc975098df1e878d181c14c88c74d4d8014d74a (diff)
Various PIRQ/MPTABLE/ACPI Kconfig fixes.
- Use HAVE_ACPI_TABLES, HAVE_MP_TABLE, and HAVE_PIRQ_TABLE (instead of GENERATE_*) in the board's Kconfig file, as all other boards do. - Add missing HAVE_ACPI_TABLES/HAVE_MP_TABLE/HAVE_PIRQ_TABLE to boards which have the respective files. The only exception: EPIA-M700 doesn't select ACPI, as it doesn't have dsdt.asl. Added a comment that the user is supposed to run the 'get_dsdt' script and edit Kconfig afterwards. - Fix minor warning/error in src/mainboard/msi/ms9652_fam10/acpi_tables.c, now that the file is actually used. - msi/ms9652_fam10: use #include instead of Include() as we usually do now. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Patrick Georgi <patrick@georgi-clan.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6027 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/dbm690t/Kconfig6
-rw-r--r--src/mainboard/amd/mahogany/Kconfig6
-rw-r--r--src/mainboard/amd/mahogany_fam10/Kconfig6
-rw-r--r--src/mainboard/amd/tilapia_fam10/Kconfig6
-rw-r--r--src/mainboard/asrock/939a785gmh/Kconfig6
-rw-r--r--src/mainboard/asus/m4a785-m/Kconfig6
-rw-r--r--src/mainboard/getac/p470/Kconfig6
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/Kconfig1
-rw-r--r--src/mainboard/gigabyte/ma785gmt/Kconfig6
-rw-r--r--src/mainboard/gigabyte/ma78gm/Kconfig6
-rw-r--r--src/mainboard/ibase/mb899/Kconfig6
-rw-r--r--src/mainboard/iei/juki-511p/Kconfig1
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/Kconfig6
-rw-r--r--src/mainboard/jetway/pa78vm5/Kconfig6
-rw-r--r--src/mainboard/kontron/986lcd-m/Kconfig6
-rw-r--r--src/mainboard/msi/ms9652_fam10/Kconfig1
-rw-r--r--src/mainboard/msi/ms9652_fam10/acpi_tables.c2
-rw-r--r--src/mainboard/msi/ms9652_fam10/dsdt.asl2
-rw-r--r--src/mainboard/via/epia-m700/Kconfig4
19 files changed, 48 insertions, 41 deletions
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index bab44a5797..6e62bf7814 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -10,9 +10,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
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_ACPI_TABLES
+ select HAVE_MP_TABLE
+ select HAVE_PIRQ_TABLE
select HAVE_OPTION_TABLE
select HAVE_MAINBOARD_RESOURCES
select HAVE_BUS_CONFIG
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index 832c058407..3f7c854cdd 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -11,9 +11,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOUTHBRIDGE_AMD_SB700
select SUPERIO_ITE_IT8718F
select BOARD_HAS_FADT
- select GENERATE_ACPI_TABLES
- select GENERATE_MP_TABLE
- select GENERATE_PIRQ_TABLE
+ select HAVE_ACPI_TABLES
+ select HAVE_MP_TABLE
+ select HAVE_PIRQ_TABLE
select HAVE_OPTION_TABLE
select HAVE_MAINBOARD_RESOURCES
select HAVE_BUS_CONFIG
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 999f4c606b..8b533b8456 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index a900fbd4dc..26112e1d7e 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index 5c48c3cd3b..d04e41d9f2 100644
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -11,9 +11,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOUTHBRIDGE_AMD_SB700
select SUPERIO_WINBOND_W83627DHG
select BOARD_HAS_FADT
- select GENERATE_ACPI_TABLES
- select GENERATE_MP_TABLE
- select GENERATE_PIRQ_TABLE
+ select HAVE_ACPI_TABLES
+ select HAVE_MP_TABLE
+ select HAVE_PIRQ_TABLE
select HAVE_MAINBOARD_RESOURCES
select HAVE_OPTION_TABLE
select HAVE_BUS_CONFIG
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index d42345d5ec..279da604ab 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -13,15 +13,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select CACHE_AS_RAM
select HAVE_HARD_RESET
select SB_HT_CHAIN_UNITID_OFFSET_ONLY
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 9cdf931b5a..af5bf778ea 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -29,9 +29,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SUPERIO_SMSC_FDC37N972
select SUPERIO_SMSC_SIO10N268
select BOARD_HAS_FADT
- select GENERATE_ACPI_TABLES
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_ACPI_TABLES
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select HAVE_ACPI_SLIC
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index dcf176ee45..a8d737a9e7 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -12,6 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select CACHE_AS_RAM
select HAVE_HARD_RESET
select LIFT_BSP_APIC_ID
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 51e03fb792..58ee44bdd6 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select ENABLE_APIC_EXT_ID
select TINY_BOOTBLOCK
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index 6545cf0672..9c7693240a 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select ENABLE_APIC_EXT_ID
select TINY_BOOTBLOCK
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index b7ceebdacc..632c805425 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -9,9 +9,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_WINBOND_W83627EHG
select BOARD_HAS_FADT
- select GENERATE_ACPI_TABLES
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_ACPI_TABLES
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select MMCONF_SUPPORT
diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig
index 7f114c4564..d948929a04 100644
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -27,6 +27,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SUPERIO_WINBOND_W83977F
select ROMCC
select PIRQ_ROUTE
+ select HAVE_PIRQ_TABLE
select HAVE_OPTION_TABLE
select BOARD_ROMSIZE_KB_256
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index bede72283e..6276198799 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index d23e58337a..2b7427b599 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select BOARD_HAS_FADT
select HAVE_BUS_CONFIG
select HAVE_OPTION_TABLE
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_MAINBOARD_RESOURCES
select CACHE_AS_RAM
select HAVE_HARD_RESET
@@ -22,7 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select LIFT_BSP_APIC_ID
select SERIAL_CPU_INIT
select AMDMCT
- select GENERATE_ACPI_TABLES
+ select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_1024
select RAMINIT_SYSINFO
select ENABLE_APIC_EXT_ID
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 6434f64773..fc3d675321 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -9,9 +9,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select SOUTHBRIDGE_INTEL_I82801GX
select SUPERIO_WINBOND_W83627THG
select BOARD_HAS_FADT
- select GENERATE_ACPI_TABLES
- select GENERATE_PIRQ_TABLE
- select GENERATE_MP_TABLE
+ select HAVE_ACPI_TABLES
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
select HAVE_OPTION_TABLE
select HAVE_ACPI_RESUME
select MMCONF_SUPPORT
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 4ed01e1fdf..1d7ea04603 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_BUS_CONFIG
select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE
+ select HAVE_ACPI_TABLES
select CACHE_AS_RAM
select HAVE_OPTION_TABLE
select HAVE_HARD_RESET
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 2cdb5c5018..08a5a25710 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -151,7 +151,7 @@ unsigned long write_acpi_tables(unsigned long start)
current += dsdt->length;
memcpy(dsdt, &AmlCode, dsdt->length);
dsdt->checksum = 0; /* Don't trust iasl to get this right. */
- dsdt->checksum = acpi_checksum(dsdt, dsdt->length);
+ dsdt->checksum = acpi_checksum((u8 *)dsdt, dsdt->length);
printk(BIOS_DEBUG, "ACPI: * DSDT @ %p Length %x\n", dsdt,
dsdt->length);
printk(BIOS_DEBUG, "ACPI: * FADT\n");
diff --git a/src/mainboard/msi/ms9652_fam10/dsdt.asl b/src/mainboard/msi/ms9652_fam10/dsdt.asl
index e5361b6822..854c6d0c37 100644
--- a/src/mainboard/msi/ms9652_fam10/dsdt.asl
+++ b/src/mainboard/msi/ms9652_fam10/dsdt.asl
@@ -23,7 +23,7 @@
DefinitionBlock ("DSDT.aml", "DSDT", 1, "LXBIOS", "LXB-DSDT", 1)
{
- Include ("../../../../src/northbridge/amd/amdk8/amdk8_util.asl")
+ #include "../../../../src/northbridge/amd/amdk8/amdk8_util.asl"
/* For now only define 2 power states:
* - S0 which is fully on
diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index 5d4434bbaf..4396cc3869 100644
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -7,6 +7,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select NORTHBRIDGE_VIA_VX800
select SUPERIO_WINBOND_W83697HF
select BOARD_HAS_FADT
+ select HAVE_PIRQ_TABLE
+ # Note: For ACPI, you need to use the 'get_dsdt' script and uncomment
+ # the "select HAVE_ACPI_TABLES" line below.
+ # select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
select BOARD_ROMSIZE_KB_512
select RAMINIT_SYSINFO