summaryrefslogtreecommitdiff
path: root/src/southbridge/amd/cimx
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-19 08:41:50 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-20 12:47:44 +0000
commit5be75d5311695316f0d34448b98299cbe8b91ea5 (patch)
tree4c51d81915c6575fc169ac51635f4875d212ed4e /src/southbridge/amd/cimx
parent830e0de40187183c34a1f558d83b65068b649e2a (diff)
downloadcoreboot-5be75d5311695316f0d34448b98299cbe8b91ea5.tar.xz
AGESA,binaryPI: Replace use of __PRE_RAM__
Change-Id: Id878fd33ec3d2de640d9a488058a805be3ccd223 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34997 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/southbridge/amd/cimx')
-rw-r--r--src/southbridge/amd/cimx/sb800/fan.h4
-rw-r--r--src/southbridge/amd/cimx/sb900/cfg.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/src/southbridge/amd/cimx/sb800/fan.h b/src/southbridge/amd/cimx/sb800/fan.h
index f31e48645e..3734da10a0 100644
--- a/src/southbridge/amd/cimx/sb800/fan.h
+++ b/src/southbridge/amd/cimx/sb800/fan.h
@@ -16,10 +16,10 @@
#ifndef _SB800_FAN_H_
#define _SB800_FAN_H_
-#ifndef __PRE_RAM__
+#include <device/device.h>
+
void init_sb800_IMC_fans(struct device *dev);
void init_sb800_MANUAL_fans(struct device *dev);
-#endif
/* Fan Register Definitions */
#define FAN_0_OFFSET 0x00
diff --git a/src/southbridge/amd/cimx/sb900/cfg.c b/src/southbridge/amd/cimx/sb900/cfg.c
index 353d5771e0..2e4173fb92 100644
--- a/src/southbridge/amd/cimx/sb900/cfg.c
+++ b/src/southbridge/amd/cimx/sb900/cfg.c
@@ -243,15 +243,13 @@ void sb900_cimx_config(AMDSBCFG *sb_config)
sb_config->PciClks = SB_PCI_CLOCK_RESERVED;
sb_config->hwm.hwmEnable = 0x0;
-#ifndef __PRE_RAM__
/* ramstage cimx config here */
- if (!sb_config->StdHeader.CALLBACK.CalloutPtr) {
+ if (ENV_RAMSTAGE && !sb_config->StdHeader.CALLBACK.CalloutPtr) {
sb_config->StdHeader.CALLBACK.CalloutPtr = sb900_callout_entry;
}
//sb_config->
-#endif //!__PRE_RAM__
- printk(BIOS_INFO, "SB900 - Cfg.c - sb900_cimx_config - End.\n");
+ printk(BIOS_INFO, "SB900 - Cfg.c - sb900_cimx_config - End.\n");
}
void SbPowerOnInit_Config(AMDSBCFG *sb_config)