Revert changes to set the sb800 to AHCI mode.

Seabios doesn't have this support included yet,
which causes the generic Persimmon and other CIMx
sb800 platforms to not boot.

Change-Id: If07328b7c62d7fc314647adce8fab983ed327854
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: http://review.coreboot.org/14
Tested-by: build bot (Jenkins)
Reviewed-by: Peter Stuge <peter@stuge.se>

diff --git a/src/southbridge/amd/cimx_wrapper/sb800/cfg.c b/src/southbridge/amd/cimx_wrapper/sb800/cfg.c
index 46ad81349941d7cbf59657b167b3a689ff0013d3..0a09e11e8643b778940608e2929f2b51b6d60b82 100644 (file)
--- a/src/southbridge/amd/cimx_wrapper/sb800/cfg.c
+++ b/src/southbridge/amd/cimx_wrapper/sb800/cfg.c
@@ -83,7 +83,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 = 1; //IDE controllor is hidden
+       sb_config->SATAMODE.SataMode.SataIdeCombinedMode = 0; //IDE controlor exposed and combined mode enabled
        sb_config->SATAMODE.SataMode.SATARefClkSel = SATA_CLOCK_SOURCE;
 
        /* Azalia HDA */

diff --git a/src/southbridge/amd/cimx_wrapper/sb800/cfg.h b/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
index 581fc661ea1a5c1c2d6397c9d00cb23d234d4c06..05db9abbe73bf511227fbb8cda74314faf34aaeb 100644 (file)
--- a/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
+++ b/src/southbridge/amd/cimx_wrapper/sb800/cfg.h
@@ -109,7 +109,7 @@
  *   NOTE: DO NOT ALLOW SATA & IDE use same mode
  */
 #ifndef SATA_MODE
-  #define SATA_MODE                    AHCI_MODE
+  #define SATA_MODE                    NATIVE_IDE_MODE
 #endif
 
 /**