Author: ruik Date: Sat Dec 11 23:26:10 2010 New Revision: 6165 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6165
Log: Following patch makes just one fadt.c file. For SB700.
Signed-off-by: Rudolf Marek r.marek@assembler.cz Acked-by: Uwe Hermann uwe@hermann-uwe.de
Deleted: trunk/src/mainboard/amd/mahogany/fadt.c trunk/src/mainboard/amd/mahogany_fam10/fadt.c trunk/src/mainboard/amd/tilapia_fam10/fadt.c trunk/src/mainboard/asrock/939a785gmh/fadt.c trunk/src/mainboard/asus/m4a785-m/fadt.c trunk/src/mainboard/gigabyte/ma785gmt/fadt.c trunk/src/mainboard/gigabyte/ma78gm/fadt.c trunk/src/mainboard/iei/kino-780am2-fam10/fadt.c trunk/src/mainboard/jetway/pa78vm5/fadt.c Modified: trunk/src/include/cbmem.h trunk/src/mainboard/amd/mahogany/Kconfig trunk/src/mainboard/amd/mahogany/acpi_tables.c trunk/src/mainboard/amd/mahogany_fam10/Kconfig trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c trunk/src/mainboard/amd/tilapia_fam10/Kconfig trunk/src/mainboard/asrock/939a785gmh/Kconfig trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c trunk/src/mainboard/asus/m4a785-m/Kconfig trunk/src/mainboard/gigabyte/ma785gmt/Kconfig trunk/src/mainboard/gigabyte/ma78gm/Kconfig trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig trunk/src/mainboard/jetway/pa78vm5/Kconfig trunk/src/southbridge/amd/sb700/Makefile.inc trunk/src/southbridge/amd/sb700/sb700.h
Modified: trunk/src/include/cbmem.h ============================================================================== --- trunk/src/include/cbmem.h Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/include/cbmem.h Sat Dec 11 23:26:10 2010 (r6165) @@ -48,6 +48,8 @@ void cbmem_list(void); void cbmem_arch_init(void);
+#ifndef __PRE_RAM__ struct cbmem_entry *get_cbmem_toc(void); void set_cbmem_toc(struct cbmem_entry *); #endif +#endif
Modified: trunk/src/mainboard/amd/mahogany/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/amd/mahogany/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_ITE_IT8718F - select BOARD_HAS_FADT select HAVE_ACPI_TABLES select HAVE_MP_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/amd/mahogany/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany/acpi_tables.c Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/amd/mahogany/acpi_tables.c Sat Dec 11 23:26:10 2010 (r6165) @@ -29,8 +29,7 @@ #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> #include <cpu/amd/model_fxx_powernow.h> - -extern u16 pm_base; +#include <southbridge/amd/sb700/sb700.h>
#define DUMP_ACPI_TABLES 0
@@ -100,7 +99,7 @@
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); + amd_model_fxx_generate_powernow(ACPI_CPU_CONTROL, 6, 1); return (unsigned long) (acpigen_get_current()); }
Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_ITE_IT8718F - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/amd/mahogany_fam10/acpi_tables.c Sat Dec 11 23:26:10 2010 (r6165) @@ -26,7 +26,6 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdfam10_sysconf.h> - #include "mb_sysconf.h"
#define DUMP_ACPI_TABLES 0
Modified: trunk/src/mainboard/amd/tilapia_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/amd/tilapia_fam10/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_ITE_IT8718F - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/asrock/939a785gmh/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_WINBOND_W83627DHG - select BOARD_HAS_FADT select HAVE_ACPI_TABLES select HAVE_MP_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/asrock/939a785gmh/acpi_tables.c Sat Dec 11 23:26:10 2010 (r6165) @@ -29,8 +29,7 @@ #include "northbridge/amd/amdk8/acpi.h" #include <arch/cpu.h> #include <cpu/amd/model_fxx_powernow.h> - -extern u16 pm_base; +#include <southbridge/amd/sb700/sb700.h>
#define DUMP_ACPI_TABLES 0
@@ -100,7 +99,7 @@
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); + amd_model_fxx_generate_powernow(ACPI_CPU_CONTROL, 6, 1); return (unsigned long) (acpigen_get_current()); }
Modified: trunk/src/mainboard/asus/m4a785-m/Kconfig ============================================================================== --- trunk/src/mainboard/asus/m4a785-m/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/asus/m4a785-m/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_SB700 select SOUTHBRIDGE_AMD_SB700_SKIP_ISA_DMA_INIT select SUPERIO_ITE_IT8712F - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/gigabyte/ma785gmt/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ma785gmt/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/gigabyte/ma785gmt/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_ITE_IT8718F - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/gigabyte/ma78gm/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ma78gm/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/gigabyte/ma78gm/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_ITE_IT8718F - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig ============================================================================== --- trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/iei/kino-780am2-fam10/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_FINTEK_F71859 - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/mainboard/jetway/pa78vm5/Kconfig ============================================================================== --- trunk/src/mainboard/jetway/pa78vm5/Kconfig Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/mainboard/jetway/pa78vm5/Kconfig Sat Dec 11 23:26:10 2010 (r6165) @@ -10,7 +10,6 @@ select SOUTHBRIDGE_AMD_RS780 select SOUTHBRIDGE_AMD_SB700 select SUPERIO_FINTEK_F71863FG - select BOARD_HAS_FADT select HAVE_BUS_CONFIG select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE
Modified: trunk/src/southbridge/amd/sb700/Makefile.inc ============================================================================== --- trunk/src/southbridge/amd/sb700/Makefile.inc Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/southbridge/amd/sb700/Makefile.inc Sat Dec 11 23:26:10 2010 (r6165) @@ -6,5 +6,6 @@ driver-y += sata.c driver-y += hda.c driver-y += pci.c +ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sb700_fadt.c ramstage-y += reset.c romstage-y += enable_usbdebug.c
Modified: trunk/src/southbridge/amd/sb700/sb700.h ============================================================================== --- trunk/src/southbridge/amd/sb700/sb700.h Sat Dec 11 23:14:44 2010 (r6164) +++ trunk/src/southbridge/amd/sb700/sb700.h Sat Dec 11 23:26:10 2010 (r6165) @@ -29,6 +29,15 @@ #define PM2_INDEX 0xcd0 #define PM2_DATA 0xcd1
+#define SB700_ACPI_IO_BASE 0x800 + +#define ACPI_PM_EVT_BLK (SB700_ACPI_IO_BASE + 0x00) /* 4 bytes */ +#define ACPI_PM1_CNT_BLK (SB700_ACPI_IO_BASE + 0x04) /* 2 bytes */ +#define ACPI_PMA_CNT_BLK (SB700_ACPI_IO_BASE + 0x0F) /* 1 byte */ +#define ACPI_PM_TMR_BLK (SB700_ACPI_IO_BASE + 0x18) /* 4 bytes */ +#define ACPI_GPE0_BLK (SB700_ACPI_IO_BASE + 0x10) /* 8 bytes */ +#define ACPI_CPU_CONTROL (SB700_ACPI_IO_BASE + 0x08) /* 6 bytes */ + extern void pm_iowrite(u8 reg, u8 value); extern u8 pm_ioread(u8 reg); extern void pm2_iowrite(u8 reg, u8 value);