Remove the building warnings.
Signed-off-by: Zheng Bao zheng.bao@amd.com
Index: src/mainboard/amd/mahogany/mptable.c =================================================================== --- src/mainboard/amd/mahogany/mptable.c (revision 5265) +++ src/mainboard/amd/mahogany/mptable.c (working copy) @@ -39,6 +39,8 @@
extern void get_bus_conf(void);
+void *smp_write_config_table(void *v); + void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; Index: src/mainboard/amd/mahogany/acpi_tables.c =================================================================== --- src/mainboard/amd/mahogany/acpi_tables.c (revision 5265) +++ src/mainboard/amd/mahogany/acpi_tables.c (working copy) @@ -101,6 +101,7 @@
extern void get_bus_conf(void);
+#if CONFIG_ACPI_SSDTX_NUM >= 1 static void update_ssdtx(void *ssdtx, int i) { uint8_t *PCI; @@ -122,6 +123,7 @@ /* 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(); Index: src/mainboard/amd/mahogany/mainboard.c =================================================================== --- src/mainboard/amd/mahogany/mainboard.c (revision 5265) +++ src/mainboard/amd/mahogany/mainboard.c (working copy) @@ -35,6 +35,10 @@
uint64_t uma_memory_base, uma_memory_size;
+void set_pcie_dereset(void); +void set_pcie_reset(void); +void add_mainboard_resources(struct lb_memory *mem); + /* * Mahogany uses GPIO 6 as PCIe slot reset, GPIO4 as GFX slot reset. We need to * pull it up before training the slot. @@ -65,42 +69,16 @@ pci_write_config16(sm_dev, 0xA8, word); }
-/******************************************************** -* mahogany uses SB700 GPIO8 to detect IDE_DMA66. -* IDE_DMA66 is routed to GPIO 8. So we read Gpio 8 to -* get the cable type, 40 pin or 80 pin? -********************************************************/ -static void get_ide_dma66() -{ - u8 byte; - /*u32 sm_dev, ide_dev; */ - device_t sm_dev, ide_dev; - - sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); - - byte = pci_read_config8(sm_dev, 0xA9); - byte |= (1 << 4); /* Set Gpio8 as input */ - pci_write_config8(sm_dev, 0xA9, byte); - - ide_dev = dev_find_slot(0, PCI_DEVFN(0x14, 1)); - byte = pci_read_config8(ide_dev, 0x56); - byte &= ~(7 << 0); - if ((1 << 4) & pci_read_config8(sm_dev, 0xAA)) - byte |= 2 << 0; /* mode 2 */ - else - byte |= 5 << 0; /* mode 5 */ - pci_write_config8(ide_dev, 0x56, byte); -} - /************************************************* * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -void mahogany_enable(device_t dev) +static void mahogany_enable(device_t dev) { - struct mainboard_config *mainboard = + /* leave it here for future. */ + /*struct mainboard_config *mainboard = (struct mainboard_config *)dev->chip_info; - + */ printk_info("Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
#if (CONFIG_GFXUMA == 1) @@ -144,17 +122,16 @@ #endif
set_pcie_dereset(); - /* get_ide_dma66(); */ }
-int add_mainboard_resources(struct lb_memory *mem) +void add_mainboard_resources(struct lb_memory *mem) { /* UMA is removed from system memory in the northbridge code, but * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); + printk_info("uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, uma_memory_size); #endif Index: src/mainboard/amd/mahogany/get_bus_conf.c =================================================================== --- src/mainboard/amd/mahogany/get_bus_conf.c (revision 5265) +++ src/mainboard/amd/mahogany/get_bus_conf.c (working copy) @@ -63,6 +63,8 @@
static u32 get_bus_conf_done = 0;
+void get_bus_conf(void); + void get_bus_conf(void) { u32 apicid_base; Index: src/mainboard/amd/mahogany_fam10/acpi_tables.c =================================================================== --- src/mainboard/amd/mahogany_fam10/acpi_tables.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/acpi_tables.c (working copy) @@ -92,7 +92,8 @@ extern void get_bus_conf(void); extern void update_ssdt(void *ssdt);
- +/* not tested yet. */ +#if 0 /* #if 0 //CONFIG_ACPI_SSDTX_NUM >= 1 */ static void update_ssdtx(void *ssdtx, int i) { u8 *PCI; @@ -115,6 +116,7 @@ /* FIXME: need to update the GSI id in the ssdtx too */
} +#endif
unsigned long write_acpi_tables(unsigned long start) { @@ -129,11 +131,7 @@ acpi_facs_t *facs; acpi_header_t *dsdt; acpi_header_t *ssdt; - acpi_header_t *ssdtx; - u8 *p;
- int i; - get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
/* Align ACPI tables to 16 bytes */ Index: src/mainboard/amd/mahogany_fam10/devicetree.cb =================================================================== --- src/mainboard/amd/mahogany_fam10/devicetree.cb (revision 5265) +++ src/mainboard/amd/mahogany_fam10/devicetree.cb (working copy) @@ -143,5 +143,3 @@ # end
end - - Index: src/mainboard/amd/mahogany_fam10/mptable.c =================================================================== --- src/mainboard/amd/mahogany_fam10/mptable.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/mptable.c (working copy) @@ -39,6 +39,8 @@
extern void get_bus_conf(void);
+void *smp_write_config_table(void *v); + void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; Index: src/mainboard/amd/mahogany_fam10/mainboard.c =================================================================== --- src/mainboard/amd/mahogany_fam10/mainboard.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/mainboard.c (working copy) @@ -35,6 +35,10 @@
uint64_t uma_memory_base, uma_memory_size;
+void set_pcie_dereset(void); +void set_pcie_reset(void); +void add_mainboard_resources(struct lb_memory *mem); + /* * Mahogany uses GPIO 6 as PCIe slot reset, GPIO4 as GFX slot reset. We need to * pull it up before training the slot. @@ -65,42 +69,16 @@ pci_write_config16(sm_dev, 0xA8, word); }
-/******************************************************** -* mahogany uses SB700 GPIO8 to detect IDE_DMA66. -* IDE_DMA66 is routed to GPIO 8. So we read Gpio 8 to -* get the cable type, 40 pin or 80 pin? -********************************************************/ -static void get_ide_dma66() -{ - u8 byte; - /*u32 sm_dev, ide_dev; */ - device_t sm_dev, ide_dev; - - sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0)); - - byte = pci_read_config8(sm_dev, 0xA9); - byte |= (1 << 4); /* Set Gpio8 as input */ - pci_write_config8(sm_dev, 0xA9, byte); - - ide_dev = dev_find_slot(0, PCI_DEVFN(0x14, 1)); - byte = pci_read_config8(ide_dev, 0x56); - byte &= ~(7 << 0); - if ((1 << 4) & pci_read_config8(sm_dev, 0xAA)) - byte |= 2 << 0; /* mode 2 */ - else - byte |= 5 << 0; /* mode 5 */ - pci_write_config8(ide_dev, 0x56, byte); -} - /************************************************* * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -void mahogany_enable(device_t dev) +static void mahogany_enable(device_t dev) { - struct mainboard_config *mainboard = + /* leave it here for future. */ + /*struct mainboard_config *mainboard = (struct mainboard_config *)dev->chip_info; - + */ printk_info("Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
#if (CONFIG_GFXUMA == 1) @@ -144,17 +122,16 @@ #endif
set_pcie_dereset(); - /* get_ide_dma66(); */ }
-int add_mainboard_resources(struct lb_memory *mem) +void add_mainboard_resources(struct lb_memory *mem) { /* UMA is removed from system memory in the northbridge code, but * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); + printk_info("uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, uma_memory_size); #endif
remove building warnings of mahogany(_fam10). About get_ide_dma66(), the SATA has port 5,6 as PATA emulation since SB700. I havent tried the IDE yet. It will be tested later. So we leave this function for furture.
Signed-off-by: Zheng Bao zheng.bao@amd.com
Index: src/mainboard/amd/mahogany/mptable.c =================================================================== --- src/mainboard/amd/mahogany/mptable.c (revision 5265) +++ src/mainboard/amd/mahogany/mptable.c (working copy) @@ -39,7 +39,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD "; Index: src/mainboard/amd/mahogany/acpi_tables.c =================================================================== --- src/mainboard/amd/mahogany/acpi_tables.c (revision 5265) +++ src/mainboard/amd/mahogany/acpi_tables.c (working copy) @@ -101,6 +101,7 @@
extern void get_bus_conf(void);
+#if CONFIG_ACPI_SSDTX_NUM >= 1 static void update_ssdtx(void *ssdtx, int i) { uint8_t *PCI; @@ -122,6 +123,7 @@ /* 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(); Index: src/mainboard/amd/mahogany/mainboard.c =================================================================== --- src/mainboard/amd/mahogany/mainboard.c (revision 5265) +++ src/mainboard/amd/mahogany/mainboard.c (working copy) @@ -25,6 +25,7 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> +#include <arch/coreboot_tables.h> #include <../southbridge/amd/sb700/sb700.h> #include "chip.h"
@@ -35,6 +36,9 @@
uint64_t uma_memory_base, uma_memory_size;
+void set_pcie_dereset(void); +void set_pcie_reset(void); + /* * Mahogany uses GPIO 6 as PCIe slot reset, GPIO4 as GFX slot reset. We need to * pull it up before training the slot. @@ -65,12 +69,13 @@ pci_write_config16(sm_dev, 0xA8, word); }
+#if 0 /* not tested yet */ /******************************************************** -* mahogany uses SB700 GPIO8 to detect IDE_DMA66. -* IDE_DMA66 is routed to GPIO 8. So we read Gpio 8 to +* mahogany uses SB700 GPIO9 to detect IDE_DMA66. +* IDE_DMA66 is routed to GPIO 9. So we read Gpio 9 to * get the cable type, 40 pin or 80 pin? ********************************************************/ -static void get_ide_dma66() +static void get_ide_dma66(void) { u8 byte; /*u32 sm_dev, ide_dev; */ @@ -79,27 +84,29 @@ sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
byte = pci_read_config8(sm_dev, 0xA9); - byte |= (1 << 4); /* Set Gpio8 as input */ + byte |= (1 << 5); /* Set Gpio9 as input */ pci_write_config8(sm_dev, 0xA9, byte);
ide_dev = dev_find_slot(0, PCI_DEVFN(0x14, 1)); byte = pci_read_config8(ide_dev, 0x56); byte &= ~(7 << 0); - if ((1 << 4) & pci_read_config8(sm_dev, 0xAA)) + if ((1 << 5) & pci_read_config8(sm_dev, 0xAA)) byte |= 2 << 0; /* mode 2 */ else byte |= 5 << 0; /* mode 5 */ pci_write_config8(ide_dev, 0x56, byte); } +#endif /* get_ide_dma66 */
/************************************************* * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -void mahogany_enable(device_t dev) +static void mahogany_enable(device_t dev) { - struct mainboard_config *mainboard = - (struct mainboard_config *)dev->chip_info; + /* Leave it for future. */ + /* struct mainboard_config *mainboard = + (struct mainboard_config *)dev->chip_info;*/
printk_info("Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
@@ -153,11 +160,12 @@ * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); + printk_info("uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, uma_memory_size); #endif + return 0; }
struct chip_operations mainboard_ops = { Index: src/mainboard/amd/mahogany/get_bus_conf.c =================================================================== --- src/mainboard/amd/mahogany/get_bus_conf.c (revision 5265) +++ src/mainboard/amd/mahogany/get_bus_conf.c (working copy) @@ -63,6 +63,8 @@
static u32 get_bus_conf_done = 0;
+void get_bus_conf(void); + void get_bus_conf(void) { u32 apicid_base; Index: src/mainboard/amd/mahogany_fam10/acpi_tables.c =================================================================== --- src/mainboard/amd/mahogany_fam10/acpi_tables.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/acpi_tables.c (working copy) @@ -92,7 +92,8 @@ extern void get_bus_conf(void); extern void update_ssdt(void *ssdt);
- +/* not tested yet. */ +#if 0 /* #if 0 //CONFIG_ACPI_SSDTX_NUM >= 1 */ static void update_ssdtx(void *ssdtx, int i) { u8 *PCI; @@ -115,6 +116,7 @@ /* FIXME: need to update the GSI id in the ssdtx too */
} +#endif
unsigned long write_acpi_tables(unsigned long start) { @@ -129,11 +131,7 @@ acpi_facs_t *facs; acpi_header_t *dsdt; acpi_header_t *ssdt; - acpi_header_t *ssdtx; - u8 *p;
- int i; - get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
/* Align ACPI tables to 16 bytes */ Index: src/mainboard/amd/mahogany_fam10/devicetree.cb =================================================================== --- src/mainboard/amd/mahogany_fam10/devicetree.cb (revision 5265) +++ src/mainboard/amd/mahogany_fam10/devicetree.cb (working copy) @@ -143,5 +143,3 @@ # end
end - - Index: src/mainboard/amd/mahogany_fam10/romstage.c =================================================================== --- src/mainboard/amd/mahogany_fam10/romstage.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/romstage.c (working copy) @@ -298,4 +298,3 @@ post_cache_as_ram(); // BSP switch stack to ram, copy then execute LB. post_code(0x43); // Should never see this post code. } - Index: src/mainboard/amd/mahogany_fam10/mptable.c =================================================================== --- src/mainboard/amd/mahogany_fam10/mptable.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/mptable.c (working copy) @@ -39,7 +39,7 @@
extern void get_bus_conf(void);
-void *smp_write_config_table(void *v) +static void *smp_write_config_table(void *v) { static const char sig[4] = "PCMP"; static const char oem[8] = "AMD "; Index: src/mainboard/amd/mahogany_fam10/mainboard.c =================================================================== --- src/mainboard/amd/mahogany_fam10/mainboard.c (revision 5265) +++ src/mainboard/amd/mahogany_fam10/mainboard.c (working copy) @@ -25,6 +25,7 @@ #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <device/pci_def.h> +#include <arch/coreboot_tables.h> #include <../southbridge/amd/sb700/sb700.h> #include "chip.h"
@@ -35,6 +36,9 @@
uint64_t uma_memory_base, uma_memory_size;
+void set_pcie_dereset(void); +void set_pcie_reset(void); + /* * Mahogany uses GPIO 6 as PCIe slot reset, GPIO4 as GFX slot reset. We need to * pull it up before training the slot. @@ -65,12 +69,13 @@ pci_write_config16(sm_dev, 0xA8, word); }
+#if 0 /* not tested yet. */ /******************************************************** -* mahogany uses SB700 GPIO8 to detect IDE_DMA66. -* IDE_DMA66 is routed to GPIO 8. So we read Gpio 8 to +* mahogany uses SB700 GPIO9 to detect IDE_DMA66. +* IDE_DMA66 is routed to GPIO 9. So we read Gpio 9 to * get the cable type, 40 pin or 80 pin? ********************************************************/ -static void get_ide_dma66() +static void get_ide_dma66(void) { u8 byte; /*u32 sm_dev, ide_dev; */ @@ -79,27 +84,29 @@ sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
byte = pci_read_config8(sm_dev, 0xA9); - byte |= (1 << 4); /* Set Gpio8 as input */ + byte |= (1 << 5); /* Set Gpio8 as input */ pci_write_config8(sm_dev, 0xA9, byte);
ide_dev = dev_find_slot(0, PCI_DEVFN(0x14, 1)); byte = pci_read_config8(ide_dev, 0x56); byte &= ~(7 << 0); - if ((1 << 4) & pci_read_config8(sm_dev, 0xAA)) + if ((1 << 5) & pci_read_config8(sm_dev, 0xAA)) byte |= 2 << 0; /* mode 2 */ else byte |= 5 << 0; /* mode 5 */ pci_write_config8(ide_dev, 0x56, byte); } +#endif /* get_ide_dma66() */
/************************************************* * enable the dedicated function in mahogany board. * This function called early than rs780_enable. *************************************************/ -void mahogany_enable(device_t dev) +static void mahogany_enable(device_t dev) { - struct mainboard_config *mainboard = - (struct mainboard_config *)dev->chip_info; + /* Leave it for furture use. */ + /* struct mainboard_config *mainboard = + (struct mainboard_config *)dev->chip_info; */
printk_info("Mainboard MAHOGANY Enable. dev=0x%p\n", dev);
@@ -153,11 +160,12 @@ * in some circumstances we want the memory mentioned as reserved. */ #if (CONFIG_GFXUMA == 1) - printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", - uma_memory_base, uma_memory_size); + printk_info("uma_memory_start=0x%llx, uma_memory_size=0x%llx \n", + uma_memory_base, uma_memory_size); lb_add_memory_range(mem, LB_MEM_RESERVED, uma_memory_base, uma_memory_size); #endif + return 0; }
struct chip_operations mainboard_ops = {
-
Bao, Zheng