[commit] r6613 - in trunk/src: southbridge/amd/cimx_wrapper/sb800 vendorcode/amd/cimx/sb800

[repository service]

Author: kerry
Date: Wed Jun  1 03:56:49 2011
New Revision: 6613
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6613

Log:
This patch fix a AMD sb800 wrapper compile warning:
 src/southbridge/amd/cimx_wrapper/sb800/late
 call clear_ioapic but not include the prototype declare header file.

Signed-off-by: Kerry She 
Acked-by: Marc Jones

Modified:
   trunk/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
   trunk/src/southbridge/amd/cimx_wrapper/sb800/late.c
   trunk/src/vendorcode/amd/cimx/sb800/EC.c
   trunk/src/vendorcode/amd/cimx/sb800/SATA.c
   trunk/src/vendorcode/amd/cimx/sb800/SBTYPE.h

Modified: trunk/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
==============================================================================
--- trunk/src/southbridge/amd/cimx_wrapper/sb800/cfg.h	Tue May 24 00:48:13 2011	(r6612)
+++ trunk/src/southbridge/amd/cimx_wrapper/sb800/cfg.h	Wed Jun  1 03:56:49 2011	(r6613)
@@ -100,7 +100,7 @@
  * @breif INCHIP Sata Controller
  */
 #ifndef SATA_CONTROLLER
-  #define SATA_CONTROLLER		ENABLED
+  #define SATA_CONTROLLER		CIMX_OPTION_ENABLED
 #endif

/**
@@ -202,7 +202,7 @@
  * @def GPP_CONTROLLER
  */
 #ifndef GPP_CONTROLLER
-  #define GPP_CONTROLLER		ENABLED
+  #define GPP_CONTROLLER		CIMX_OPTION_ENABLED
 #endif

/**

Modified: trunk/src/southbridge/amd/cimx_wrapper/sb800/late.c
==============================================================================
--- trunk/src/southbridge/amd/cimx_wrapper/sb800/late.c	Tue May 24 00:48:13 2011	(r6612)
+++ trunk/src/southbridge/amd/cimx_wrapper/sb800/late.c	Wed Jun  1 03:56:49 2011	(r6613)
@@ -21,6 +21,7 @@
 #include <device/device.h>	/* device_t */
 #include <device/pci.h>		/* device_operations */
 #include <device/pci_ids.h>
+#include <arch/ioapic.h>
 #include <device/smbus.h>	/* smbus_bus_operations */
 #include <console/console.h>	/* printk */
 #include "lpc.h"		/* lpc_read_resources */
@@ -328,13 +329,13 @@
    switch (dev->path.pci.devfn) {
    case (0x11 << 3) | 0: /* 0:11.0  SATA */
    	if (dev->enabled) {
-  			sb_config->SATAMODE.SataMode.SataController = ENABLED;
+  			sb_config->SATAMODE.SataMode.SataController = CIMX_OPTION_ENABLED;
    		if (1 == sb_chip->boot_switch_sata_ide)
    			sb_config->SATAMODE.SataMode.SataIdeCombMdPriSecOpt = 0; //0 -IDE as primary.
    		else if (0 == sb_chip->boot_switch_sata_ide)
    			sb_config->SATAMODE.SataMode.SataIdeCombMdPriSecOpt = 1; //1 -IDE as secondary.
    	} else {
-  			sb_config->SATAMODE.SataMode.SataController = DISABLED;
+  			sb_config->SATAMODE.SataMode.SataController = CIMX_OPTION_DISABLED;
    	}

sataInitBeforePciEnum(sb_config); // Init SATA class code and PHY
@@ -352,11 +353,10 @@

case (0x14 << 3) | 0: /* 0:14:0 SMBUS */
         {
-	    u8 byte;
        u32 ioapic_base;

printk(BIOS_INFO, "sm_init().\n");
-	    ioapic_base = 0xFEC00000;
+	    ioapic_base = IO_APIC_ADDR;
        clear_ioapic(ioapic_base);
        /* I/O APIC IDs are normally limited to 4-bits. Enforce this limit. */
        #if (CONFIG_APIC_ID_OFFSET == 0 && CONFIG_MAX_CPUS * CONFIG_MAX_PHYSICAL_CPUS < 16)
@@ -374,9 +374,9 @@

case (0x14 << 3) | 1: /* 0:14:1 IDE */
    	if (dev->enabled) {
-			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = ENABLED;
+			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = CIMX_OPTION_ENABLED;
    	} else {
-  			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = DISABLED;
+  			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = CIMX_OPTION_DISABLED;
    	}
    	sataInitBeforePciEnum(sb_config); // Init SATA class code and PHY
    	break;

Modified: trunk/src/vendorcode/amd/cimx/sb800/EC.c
==============================================================================
--- trunk/src/vendorcode/amd/cimx/sb800/EC.c	Tue May 24 00:48:13 2011	(r6612)
+++ trunk/src/vendorcode/amd/cimx/sb800/EC.c	Wed Jun  1 03:56:49 2011	(r6613)
@@ -71,7 +71,7 @@
   RWEC8 (0x61, 0x00, (MailBoxPort & 0xFF));  //set LSB of Mailbox port
   RWEC8 (0x30, 0x00, 0x01);               //;Enable Mailbox Registers Interface, bit0=1

-  if ( pConfig->BuildParameters.EcKbd == ENABLED) {
+  if ( pConfig->BuildParameters.EcKbd == CIMX_OPTION_ENABLED) {
     //Enable KBRST#, IRQ1 & IRQ12, GateA20 Function signal from IMC
     RWMEM (ACPI_MMIO_BASE + PMIO_BASE + SB_PMIOA_REGD6, AccWidthUint8, ~BIT8, BIT0 + BIT1 + BIT2 + BIT3);

@@ -83,7 +83,7 @@
     RWEC8 (0x30, 0x00, 0x01);
   }

-  if ( pConfig->BuildParameters.EcChannel0 == ENABLED) {
+  if ( pConfig->BuildParameters.EcChannel0 == CIMX_OPTION_ENABLED) {
     //Logical device 0x03
     RWEC8 (0x07, 0x00, 0x03);
     RWEC8 (0x60, 0x00, 0x00);

Modified: trunk/src/vendorcode/amd/cimx/sb800/SATA.c
==============================================================================
--- trunk/src/vendorcode/amd/cimx/sb800/SATA.c	Tue May 24 00:48:13 2011	(r6612)
+++ trunk/src/vendorcode/amd/cimx/sb800/SATA.c	Wed Jun  1 03:56:49 2011	(r6613)
@@ -470,7 +470,7 @@

if (((pConfig->SataClass) != NATIVE_IDE_MODE) && ((pConfig->SataClass) != LEGACY_IDE_MODE)) {
     // RIAD or AHCI
-    if ((pConfig->SATAMODE.SataMode.SataIdeCombinedMode) == DISABLED) {
+    if ((pConfig->SATAMODE.SataMode.SataIdeCombinedMode) == CIMX_OPTION_DISABLED) {
       RWMEM ((ddBar5 + SB_SATA_BAR5_REG00), AccWidthUint8 | S3_SAVE, ~(BIT2 + BIT1 + BIT0), BIT2 + BIT0);
       RWMEM ((ddBar5 + SB_SATA_BAR5_REG0C), AccWidthUint8 | S3_SAVE, 0xC0, 0x3F);
       // RPR 8.10 Disabling CCC (Command Completion Coalescing) support.
@@ -631,7 +631,7 @@
   //Enable write access to pci header, pm capabilities
   RWPCI (((SATA_BUS_DEV_FUN << 16) + SB_SATA_REG40), AccWidthUint8 | S3_SAVE, 0xff, BIT0);

-//  if ((pConfig->SATAMODE.SataMode.SataIdeCombinedMode) == DISABLED) {
+//  if ((pConfig->SATAMODE.SataMode.SataIdeCombinedMode) == CIMX_OPTION_DISABLED) {
   RWPCI (((SATA_BUS_DEV_FUN << 16) + SB_SATA_REG40 + 1), AccWidthUint8 | S3_SAVE, ~BIT7, BIT7);
 //  }
   sataBar5setting (pConfig, &ddBar5);

Modified: trunk/src/vendorcode/amd/cimx/sb800/SBTYPE.h
==============================================================================
--- trunk/src/vendorcode/amd/cimx/sb800/SBTYPE.h	Tue May 24 00:48:13 2011	(r6612)
+++ trunk/src/vendorcode/amd/cimx/sb800/SBTYPE.h	Wed Jun  1 03:56:49 2011	(r6613)
@@ -1093,13 +1093,13 @@
 #pragma pack (pop)

/**
- * DISABLED - Define disable in module
+ * CIMX_OPTION_DISABLED - Define disable in module
  */
-#define DISABLED   0
+#define CIMX_OPTION_DISABLED   0
 /**
- * ENABLED - Define enable in module
+ * CIMX_OPTION_ENABLED - Define enable in module
  */
-#define ENABLED    1
+#define CIMX_OPTION_ENABLED    1

// mov al, code
 // out 80h, al