[coreboot] [commit] r6027 - in trunk/src/mainboard: amd/dbm690t amd/mahogany amd/mahogany_fam10 amd/tilapia_fam10 asrock/939a785gmh asus/m4a785-m getac/p470 gigabyte/ga_2761gxdk gigabyte/ma785gmt gigabyte/ma7...

repository service svn at coreboot.org
Fri Nov 5 17:17:46 CET 2010


Author: oxygene
Date: Fri Nov  5 17:17:46 2010
New Revision: 6027
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6027

Log:
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 at hermann-uwe.de>
Acked-by: Patrick Georgi <patrick at georgi-clan.de>

Modified:
   trunk/src/mainboard/amd/dbm690t/Kconfig
   trunk/src/mainboard/amd/mahogany/Kconfig
   trunk/src/mainboard/amd/mahogany_fam10/Kconfig
   trunk/src/mainboard/amd/tilapia_fam10/Kconfig
   trunk/src/mainboard/asrock/939a785gmh/Kconfig
   trunk/src/mainboard/asus/m4a785-m/Kconfig
   trunk/src/mainboard/getac/p470/Kconfig
   trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
   trunk/src/mainboard/gigabyte/ma785gmt/Kconfig
   trunk/src/mainboard/gigabyte/ma78gm/Kconfig
   trunk/src/mainboard/ibase/mb899/Kconfig
   trunk/src/mainboard/iei/juki-511p/Kconfig
   trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig
   trunk/src/mainboard/jetway/pa78vm5/Kconfig
   trunk/src/mainboard/kontron/986lcd-m/Kconfig
   trunk/src/mainboard/msi/ms9652_fam10/Kconfig
   trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c
   trunk/src/mainboard/msi/ms9652_fam10/dsdt.asl
   trunk/src/mainboard/via/epia-m700/Kconfig

Modified: trunk/src/mainboard/amd/dbm690t/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/amd/dbm690t/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -10,9 +10,9 @@
 	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

Modified: trunk/src/mainboard/amd/mahogany/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/mahogany/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/amd/mahogany/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -11,9 +11,9 @@
 	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

Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/amd/tilapia_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/tilapia_fam10/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/amd/tilapia_fam10/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/asrock/939a785gmh/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -11,9 +11,9 @@
 	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

Modified: trunk/src/mainboard/asus/m4a785-m/Kconfig
==============================================================================
--- trunk/src/mainboard/asus/m4a785-m/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/asus/m4a785-m/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,15 +13,15 @@
 	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

Modified: trunk/src/mainboard/getac/p470/Kconfig
==============================================================================
--- trunk/src/mainboard/getac/p470/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/getac/p470/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -29,9 +29,9 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -12,6 +12,7 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ma785gmt/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ma785gmt/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/gigabyte/ma785gmt/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/gigabyte/ma78gm/Kconfig
==============================================================================
--- trunk/src/mainboard/gigabyte/ma78gm/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/gigabyte/ma78gm/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/ibase/mb899/Kconfig
==============================================================================
--- trunk/src/mainboard/ibase/mb899/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/ibase/mb899/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -9,9 +9,9 @@
 	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

Modified: trunk/src/mainboard/iei/juki-511p/Kconfig
==============================================================================
--- trunk/src/mainboard/iei/juki-511p/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/iei/juki-511p/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -27,6 +27,7 @@
 	select SUPERIO_WINBOND_W83977F
 	select ROMCC
 	select PIRQ_ROUTE
+	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
 	select BOARD_ROMSIZE_KB_256
 

Modified: trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/jetway/pa78vm5/Kconfig
==============================================================================
--- trunk/src/mainboard/jetway/pa78vm5/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/jetway/pa78vm5/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -13,8 +13,8 @@
 	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 @@
 	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

Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig
==============================================================================
--- trunk/src/mainboard/kontron/986lcd-m/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/kontron/986lcd-m/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -9,9 +9,9 @@
 	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

Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -14,6 +14,7 @@
 	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

Modified: trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/msi/ms9652_fam10/acpi_tables.c	Fri Nov  5 17:17:46 2010	(r6027)
@@ -151,7 +151,7 @@
 	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");

Modified: trunk/src/mainboard/msi/ms9652_fam10/dsdt.asl
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/dsdt.asl	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/msi/ms9652_fam10/dsdt.asl	Fri Nov  5 17:17:46 2010	(r6027)
@@ -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

Modified: trunk/src/mainboard/via/epia-m700/Kconfig
==============================================================================
--- trunk/src/mainboard/via/epia-m700/Kconfig	Fri Nov  5 13:44:25 2010	(r6026)
+++ trunk/src/mainboard/via/epia-m700/Kconfig	Fri Nov  5 17:17:46 2010	(r6027)
@@ -7,6 +7,10 @@
 	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




More information about the coreboot mailing list