[coreboot] [commit] r5432 - in trunk/src: arch/i386/include/arch mainboard/amd/dbm690t mainboard/amd/mahogany mainboard/amd/mahogany_fam10 mainboard/amd/pistachio mainboard/amd/serengeti_cheetah mainboard/amd...
repository service
svn at coreboot.org
Wed Apr 14 18:50:17 CEST 2010
Author: myles
Date: Wed Apr 14 18:50:16 2010
New Revision: 5432
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5432
Log:
Remove few more warnings and some dead code.
Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>
Modified:
trunk/src/arch/i386/include/arch/acpi.h
trunk/src/mainboard/amd/dbm690t/acpi_tables.c
trunk/src/mainboard/amd/mahogany/acpi_tables.c
trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c
trunk/src/mainboard/amd/pistachio/acpi_tables.c
trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c
trunk/src/mainboard/intel/eagleheights/acpi_tables.c
trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c
trunk/src/mainboard/kontron/kt690/acpi_tables.c
trunk/src/mainboard/technexion/tim5690/acpi_tables.c
trunk/src/mainboard/technexion/tim8690/acpi_tables.c
trunk/src/mainboard/via/epia-m/acpi_tables.c
trunk/src/mainboard/via/epia-m700/wakeup.c
trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c
trunk/src/northbridge/amd/amdk8/amdk8_acpi.c
trunk/src/northbridge/via/vx800/examples/romstage.c
trunk/src/southbridge/via/vt8237r/vt8237r_early_smbus.c
Modified: trunk/src/arch/i386/include/arch/acpi.h
==============================================================================
--- trunk/src/arch/i386/include/arch/acpi.h Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/arch/i386/include/arch/acpi.h Wed Apr 14 18:50:16 2010 (r5432)
@@ -365,6 +365,9 @@
void acpi_create_ssdt_generator(acpi_header_t *ssdt, const char *oem_table_id);
void acpi_create_fadt(acpi_fadt_t *fadt,acpi_facs_t *facs, void *dsdt);
+void update_ssdt(void* ssdt);
+void update_ssdtx(void* ssdtx, int i);
+
/* These can be used by the target port */
u8 acpi_checksum(u8 *table, u32 length);
Modified: trunk/src/mainboard/amd/dbm690t/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/dbm690t/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -92,28 +92,6 @@
return current;
}
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (uint8_t) ('4' + i - 1);
- } else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -99,32 +99,6 @@
return current;
}
-
-
-#if CONFIG_ACPI_SSDTX_NUM >= 1
-static void update_ssdtx(void *ssdtx, int i)
-{
- u8 *PCI;
- u8 *HCIN;
- u8 *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (u8) ('4' + i - 1);
- } else {
- *PCI = (u8) ('A' + i - 1 - 6);
- }
- *HCIN = (u8) i;
- *UID = (u8) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-#endif
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -89,34 +89,6 @@
return current;
}
-
-extern void update_ssdt(void *ssdt);
-
-/* not tested yet. */
-#if CONFIG_ACPI_SSDTX_NUM >= 1
-static void update_ssdtx(void *ssdtx, int i)
-{
- u8 *PCI;
- u8 *HCIN;
- u8 *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (u8) ('4' + i - 1);
- } else {
- *PCI = (u8) ('A' + i - 1 - 6);
- }
- *HCIN = (u8) i;
- *UID = (u8) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-#endif
-
unsigned long write_acpi_tables(unsigned long start)
{
unsigned long current;
Modified: trunk/src/mainboard/amd/pistachio/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/pistachio/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -92,30 +92,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (uint8_t) ('4' + i - 1);
- } else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/serengeti_cheetah/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -150,31 +150,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- u8 *PCI;
- u8 *HCIN;
- u8 *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if(i<7) {
- *PCI = (u8) ('4' + i - 1);
- }
- else {
- *PCI = (u8) ('A' + i - 1 - 6);
- }
- *HCIN = (u8) i;
- *UID = (u8) (i+3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
return (unsigned long) (acpigen_get_current());
Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -160,32 +160,6 @@
return current;
}
-
-extern void update_ssdt(void *ssdt);
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- u8 *PCI;
- u8 *HCIN;
- u8 *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if(i<7) {
- *PCI = (u8) ('4' + i - 1);
- }
- else {
- *PCI = (u8) ('A' + i - 1 - 6);
- }
- *HCIN = (u8) i;
- *UID = (u8) (i+3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long write_acpi_tables(unsigned long start)
{
unsigned long current;
Modified: trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -99,32 +99,6 @@
return current;
}
-
-
-#if CONFIG_ACPI_SSDTX_NUM >= 1
-static void update_ssdtx(void *ssdtx, int i)
-{
- u8 *PCI;
- u8 *HCIN;
- u8 *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (u8) ('4' + i - 1);
- } else {
- *PCI = (u8) ('A' + i - 1 - 6);
- }
- *HCIN = (u8) i;
- *UID = (u8) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-#endif
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/intel/eagleheights/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/intel/eagleheights/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/intel/eagleheights/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -50,7 +50,7 @@
return current;
}
-void acpi_create_intel_hpet(acpi_hpet_t * hpet)
+static void acpi_create_intel_hpet(acpi_hpet_t * hpet)
{
#define HPET_ADDR 0xfed00000ULL
acpi_header_t *header = &(hpet->header);
Modified: trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/iwill/dk8_htx/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -157,31 +157,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if(i<7) {
- *PCI = (uint8_t) ('4' + i - 1);
- }
- else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i+3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
return (unsigned long) (acpigen_get_current());
Modified: trunk/src/mainboard/kontron/kt690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/kontron/kt690/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -92,30 +92,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (uint8_t) ('4' + i - 1);
- } else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/technexion/tim5690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/technexion/tim5690/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -92,30 +92,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (uint8_t) ('4' + i - 1);
- } else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/technexion/tim8690/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/technexion/tim8690/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -92,30 +92,6 @@
return current;
}
-
-
-static void update_ssdtx(void *ssdtx, int i)
-{
- uint8_t *PCI;
- uint8_t *HCIN;
- uint8_t *UID;
-
- PCI = ssdtx + 0x32;
- HCIN = ssdtx + 0x39;
- UID = ssdtx + 0x40;
-
- if (i < 7) {
- *PCI = (uint8_t) ('4' + i - 1);
- } else {
- *PCI = (uint8_t) ('A' + i - 1 - 6);
- }
- *HCIN = (uint8_t) i;
- *UID = (uint8_t) (i + 3);
-
- /* FIXME: need to update the GSI id in the ssdtx too */
-
-}
-
unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
k8acpi_write_vars();
amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
Modified: trunk/src/mainboard/via/epia-m/acpi_tables.c
==============================================================================
--- trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/via/epia-m/acpi_tables.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -42,8 +42,6 @@
unsigned long current;
acpi_rsdp_t *rsdp;
acpi_rsdt_t *rsdt;
- acpi_hpet_t *hpet;
- acpi_madt_t *madt;
acpi_fadt_t *fadt;
acpi_facs_t *facs;
acpi_header_t *dsdt;
Modified: trunk/src/mainboard/via/epia-m700/wakeup.c
==============================================================================
--- trunk/src/mainboard/via/epia-m700/wakeup.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/mainboard/via/epia-m700/wakeup.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -133,12 +133,12 @@
//jason_tsc_count_end();
unsigned long long *real_mode_gdt_entries_at_eseg;
- real_mode_gdt_entries_at_eseg = WAKE_THUNK16_GDT; /* Copy from real_mode_gdt_entries and change limition to 1M and data base to 0; */
+ real_mode_gdt_entries_at_eseg = (void *)WAKE_THUNK16_GDT; /* Copy from real_mode_gdt_entries and change limition to 1M and data base to 0; */
real_mode_gdt_entries_at_eseg[0] = 0x0000000000000000ULL; /* Null descriptor */
real_mode_gdt_entries_at_eseg[1] = 0x000f9a000000ffffULL; /* 16-bit real-mode 1M code at 0x00000000 */
real_mode_gdt_entries_at_eseg[2] = 0x000f93000000ffffULL; /* 16-bit real-mode 1M data at 0x00000000 */
- wake_thunk16_Xgt_desc = WAKE_THUNK16_XDTR;
+ wake_thunk16_Xgt_desc = (void *)WAKE_THUNK16_XDTR;
wake_thunk16_Xgt_desc[0].size = sizeof(real_mode_gdt_entries) - 1;
wake_thunk16_Xgt_desc[0].address = (long)real_mode_gdt_entries_at_eseg;
wake_thunk16_Xgt_desc[1].size = 0x3ff;
@@ -156,7 +156,7 @@
unsigned char *dest, *src;
src = (unsigned char *)dwEip;
- dest = WAKE_RECOVER1M_CODE;
+ dest = (void *)WAKE_RECOVER1M_CODE;
u32 i;
for (i = 0; i < 0x200; i++)
dest[i] = src[i];
Modified: trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c
==============================================================================
--- trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/northbridge/amd/amdfam10/amdfam10_acpi.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -268,6 +268,28 @@
}
+void update_ssdtx(void *ssdtx, int i)
+{
+ u8 *PCI;
+ u8 *HCIN;
+ u8 *UID;
+
+ PCI = ssdtx + 0x32;
+ HCIN = ssdtx + 0x39;
+ UID = ssdtx + 0x40;
+
+ if (i < 7) {
+ *PCI = (u8) ('4' + i - 1);
+ } else {
+ *PCI = (u8) ('A' + i - 1 - 6);
+ }
+ *HCIN = (u8) i;
+ *UID = (u8) (i + 3);
+
+ /* FIXME: need to update the GSI id in the ssdtx too */
+
+}
+
static void update_sspr(void *sspr, u32 nodeid, u32 cpuindex)
{
u8 *CPU;
@@ -291,7 +313,7 @@
CONTROL = sspr + 0x8d;
STATUS = sspr + 0x8f;
- sprintf(CPU, "%02x", (char)cpuindex);
+ sprintf((char*)CPU, "%02x", (char)cpuindex);
*CPUIN = (u8) cpuindex;
for(i=0;i<sysconf.p_state_num;i++) {
Modified: trunk/src/northbridge/amd/amdk8/amdk8_acpi.c
==============================================================================
--- trunk/src/northbridge/amd/amdk8/amdk8_acpi.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/northbridge/amd/amdk8/amdk8_acpi.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -291,3 +291,26 @@
acpigen_patch_len(lens - 1);
return lens;
}
+
+void update_ssdtx(void *ssdtx, int i)
+{
+ u8 *PCI;
+ u8 *HCIN;
+ u8 *UID;
+
+ PCI = ssdtx + 0x32;
+ HCIN = ssdtx + 0x39;
+ UID = ssdtx + 0x40;
+
+ if (i < 7) {
+ *PCI = (u8) ('4' + i - 1);
+ } else {
+ *PCI = (u8) ('A' + i - 1 - 6);
+ }
+ *HCIN = (u8) i;
+ *UID = (u8) (i + 3);
+
+ /* FIXME: need to update the GSI id in the ssdtx too */
+
+}
+
Modified: trunk/src/northbridge/via/vx800/examples/romstage.c
==============================================================================
--- trunk/src/northbridge/via/vx800/examples/romstage.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/northbridge/via/vx800/examples/romstage.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -47,7 +47,7 @@
#include "northbridge/via/vx800/raminit.c"
-int acpi_is_wakeup_early_via_vx800(void)
+static int acpi_is_wakeup_early_via_vx800(void)
{
device_t dev;
u16 tmp, result;
Modified: trunk/src/southbridge/via/vt8237r/vt8237r_early_smbus.c
==============================================================================
--- trunk/src/southbridge/via/vt8237r/vt8237r_early_smbus.c Wed Apr 14 18:39:30 2010 (r5431)
+++ trunk/src/southbridge/via/vt8237r/vt8237r_early_smbus.c Wed Apr 14 18:50:16 2010 (r5432)
@@ -295,9 +295,10 @@
pci_write_config8(dev, 0x41, 0x7f);
}
+#ifdef CONFIG_NORTHBRIDGE_AMD_K8 /* CN700 doesn't have the support yet */
#define ACPI_IS_WAKEUP_EARLY 1
-int acpi_is_wakeup_early(void) {
+static int acpi_is_wakeup_early(void) {
device_t dev;
u16 tmp;
@@ -325,6 +326,7 @@
print_debug_hex8(tmp);
return ((tmp & (7 << 10)) >> 10) == 1 ? 3 : 0 ;
}
+#endif
#if defined(__GNUC__)
void vt8237_early_spi_init(void)
More information about the coreboot
mailing list