Patch set updated for coreboot: c098e66 sb800: Add Kconfig option ENABLE_IDE_COMBINED_MODE

[Kerry Sheh]

Kerry Sheh ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/231

-gerrit

commit c098e66cd2aff9089afde58fc37226a3dff220fe
Author: Kerry Sheh 
Date:   Tue Oct 11 17:27:06 2011 +0800

sb800: Add Kconfig option ENABLE_IDE_COMBINED_MODE

Add this option to enable/disable SATA IDE Combined Mode feature

Change-Id: I1ab8acd27947a71baf954f44d0741f81f48e5541
    Signed-off-by: Kerry Sheh 
    Signed-off-by: Kerry Sheh 
---
 src/southbridge/amd/cimx/sb800/Kconfig |   16 ++++++++++++++++
 src/southbridge/amd/cimx/sb800/cfg.c   |    2 +-
 src/southbridge/amd/cimx/sb800/late.c  |    5 -----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index b7ac0db..17ff3f9 100644
--- a/src/southbridge/amd/cimx/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -28,6 +28,22 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT
         string
         default "southbridge/amd/cimx/sb800/bootblock.c"

+config ENABLE_IDE_COMBINED_MODE
+	bool "Enable SATA IDE combined mode"
+	default n
+	help
+	  If Combined Mode is enabled. IDE controller is exposed and
+	  SATA controller has control over Port0 through Port3,
+	  IDE controller has control over Port4 and Port5.
+
+	  If Combined Mode is disabled, IDE controller is hidden and
+	  SATA controller has full control of all 6 Ports when operating in non-IDE mode.
+
+config IDE_COMBINED_MODE
+	hex
+	default "0x0" if ENABLE_IDE_COMBINED_MODE
+	default "0x1" if !ENABLE_IDE_COMBINED_MODE
+
 choice
    prompt "SATA Mode"
    default SB800_SATA_IDE
diff --git a/src/southbridge/amd/cimx/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index a7801a8..a34dd14 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
@@ -84,7 +84,7 @@ void sb800_cimx_config(AMDSBCFG *sb_config)
    sb_config->SATAMODE.SataMode.SataController = SATA_CONTROLLER;
    sb_config->SATAMODE.SataMode.SataIdeCombMdPriSecOpt = 0; //0 -IDE as primary, 1 -IDE as secondary.
    							//TODO: set to secondary not take effect.
-	sb_config->SATAMODE.SataMode.SataIdeCombinedMode = 0; //IDE controlor exposed and combined mode enabled
+	sb_config->SATAMODE.SataMode.SataIdeCombinedMode = CONFIG_IDE_COMBINED_MODE;
    sb_config->SATAMODE.SataMode.SATARefClkSel = SATA_CLOCK_SOURCE;

/* Azalia HDA */
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index c36ee03..b78f1ce 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -343,11 +343,6 @@ static void sb800_enable(device_t dev)
    	break;

case (0x14 << 3) | 1: /* 0:14:1 IDE */
-		if (dev->enabled) {
-			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = CIMX_OPTION_ENABLED;
-		} else {
-  			sb_config->SATAMODE.SataMode.SataIdeCombinedMode = CIMX_OPTION_DISABLED;
-		}
    	break;

case (0x14 << 3) | 2: /* 0:14:2 HDA */