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

diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index bab44a57977526790d33527f2c4d2000595bda9c..6e62bf78147f92b34a658477f86ca5a3720e580a 100644 (file)
--- 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 832c0584073381a21fc4839d49e0b77940e8cc6f..3f7c854cddffd187738c5e4425de46dbb5715fa1 100644 (file)
--- 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 999f4c606b23c3512f0ddb6ad382126a1c711e46..8b533b8456c1948b7dcf34f9148ea38e446e9ed5 100644 (file)
--- 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 a900fbd4dc53e5f35ad555afb492de9546c3319d..26112e1d7e58949c4526d26631459cb40277a537 100644 (file)
--- 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 5c48c3cd3b1253ed76d67c8c531a13eb9861b5bb..d04e41d9f2412d3066b76098041ab6f0798539ef 100644 (file)
--- 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 d42345d5ec88cf74a3baf57dca7197d68849a4c2..279da604abd7585b357ecf2a89d3e179e40751f8 100644 (file)
--- 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 9cdf931b5a0f032d628a4de0c9b881372e8f2508..af5bf778eabd991680c08e8a7dbf723a6ac70560 100644 (file)
--- 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 dcf176ee45cfe6b6dca59e82d33415f4774bf965..a8d737a9e7ad6d1de3d04df9834024177102fa8c 100644 (file)
--- 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 51e03fb792ef3e8c0fefb92400396e3aef9c4a33..58ee44bdd65f6ccf6a465ea9ab22630b69229583 100644 (file)
--- 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 6545cf0672c7e6e64515d85817e27727d0293474..9c7693240a9aa9f10f2f35becfac8c52b102b6aa 100644 (file)
--- 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 b7ceebdaccd70e01bbed337723581cb8e97b4092..632c80542570f8d76cfd99c8edc62921bba0b986 100644 (file)
--- 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 7f114c4564b83a92880914867ce81377fbd57498..d948929a04fccd0ef0d83f2baaf1cddc69630653 100644 (file)
--- 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 bede72283efe9aa5200e0c1c2686c3dcbf5f8088..62761987994713857c61d840078f86f04c39aebe 100644 (file)
--- 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 d23e58337ac6490b17a5cf3bcc88fc7aa1680a5d..2b7427b599371ee4b5af21ed69e74fce033aaa54 100644 (file)
--- 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 6434f64773e50c32281c46ba5f3c7579060f2434..fc3d675321fc9566f8b1f265d799bd220c95e8ae 100644 (file)
--- 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 4ed01e1fdf031400e243bdc4a68a9da2c4c4c2d3..1d7ea0460354630ffb3ae343c070c5d7f8a91408 100644 (file)
--- 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 2cdb5c50185b626baff9e4f18fca63869fcf31cd..08a5a25710b9457f8f4c2619be3b294f4d07fbff 100644 (file)
--- 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 e5361b6822b74126d7b248f4d29ecb44baf498a0..854c6d0c378a1e4c2258be3b378a8c0a81d50d80 100644 (file)
--- 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 5d4434bbaf8b4e1716452f0e77b4c74941be8b33..4396cc38696d91f50205a15b25f783377a4aac30 100644 (file)
--- 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