From c4f1a77cd238b106e84d15a4b62e1ffe169e6200 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Sat, 5 Jun 2010 10:03:08 +0000 Subject: Fix two warnings: 108 src/arch/i386/include/arch/acpi.h:402:5: warning: "CONFIG_HAVE_ACPI_SLIC" is not defined 1 src/mainboard/getac/p470/mainboard.c:83: warning: assignment discards qualifiers from pointer target type Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5614 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/Kconfig | 4 ++++ src/mainboard/getac/p470/Kconfig | 6 +----- src/mainboard/getac/p470/hda_verb.h | 2 +- src/mainboard/ibase/mb899/Kconfig | 5 ----- src/mainboard/intel/d945gclf/Kconfig | 5 ----- src/mainboard/kontron/986lcd-m/Kconfig | 5 ----- src/mainboard/roda/rk886ex/Kconfig | 5 ----- src/southbridge/intel/i82801gx/i82801gx_azalia.c | 6 +++--- 8 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/Kconfig b/src/Kconfig index 3e8e6dbcfa..afddca9375 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -164,6 +164,10 @@ config HAVE_ACPI_RESUME bool default n +config HAVE_ACPI_SLIC + bool + default n + config ACPI_SSDTX_NUM int default 0 diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 08030b7532..1c94c263ab 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -33,6 +33,7 @@ config BOARD_GETAC_P470 select GENERATE_MP_TABLE select HAVE_HARD_RESET select HAVE_ACPI_RESUME + select HAVE_ACPI_SLIC select HAVE_MAINBOARD_RESOURCES select MMCONF_SUPPORT select USE_PRINTK_IN_CAR @@ -89,8 +90,3 @@ config FALLBACK_VGA_BIOS_FILE default "getac-pci8086,27a2.rom" depends on BOARD_GETAC_P470 -config HAVE_ACPI_SLIC - bool - default y - depends on BOARD_GETAC_P470 - diff --git a/src/mainboard/getac/p470/hda_verb.h b/src/mainboard/getac/p470/hda_verb.h index ab9c55772c..305e05fc06 100644 --- a/src/mainboard/getac/p470/hda_verb.h +++ b/src/mainboard/getac/p470/hda_verb.h @@ -95,6 +95,6 @@ static const u32 mainboard_cim_verb_data[] = { 0x01F71F41, }; -extern u32 * cim_verb_data; +extern const u32 * cim_verb_data; extern u32 cim_verb_data_size; diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index 37b80434af..2875973dea 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -66,8 +66,3 @@ config FALLBACK_VGA_BIOS_FILE default "amipci_01.20" depends on BOARD_IBASE_MB899 -config HAVE_ACPI_SLIC - bool - default n - depends on BOARD_IBASE_MB899 - diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 1013404016..b9c396da61 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -89,8 +89,3 @@ config MAX_PHYSICAL_CPUS default 2 depends on BOARD_INTEL_D945GCLF -config HAVE_ACPI_SLIC - bool - default n - depends on BOARD_INTEL_D945GCLF - diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index a091080b21..41670d22ff 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -66,8 +66,3 @@ config FALLBACK_VGA_BIOS_FILE default "amipci_01.20" depends on BOARD_KONTRON_986LCD_M -config HAVE_ACPI_SLIC - bool - default n - depends on BOARD_KONTRON_986LCD_M - diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 1d03d5d055..02423c6615 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -63,8 +63,3 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x6886 depends on BOARD_RODA_RK886EX -config HAVE_ACPI_SLIC - bool - default n - depends on BOARD_RODA_RK886EX - diff --git a/src/southbridge/intel/i82801gx/i82801gx_azalia.c b/src/southbridge/intel/i82801gx/i82801gx_azalia.c index 5899ad6c0e..a7769dce23 100644 --- a/src/southbridge/intel/i82801gx/i82801gx_azalia.c +++ b/src/southbridge/intel/i82801gx/i82801gx_azalia.c @@ -90,10 +90,10 @@ no_codec: return 0; } -u32 * cim_verb_data = NULL; +const u32 * cim_verb_data = NULL; u32 cim_verb_data_size = 0; -static u32 find_verb(struct device *dev, u32 viddid, u32 ** verb) +static u32 find_verb(struct device *dev, u32 viddid, const u32 ** verb) { int idx=0; @@ -166,7 +166,7 @@ static int wait_for_valid(u32 base) static void codec_init(struct device *dev, u32 base, int addr) { u32 reg32; - u32 *verb; + const u32 *verb; u32 verb_size; int i; -- cgit v1.2.3