diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-19 08:41:50 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-20 12:47:44 +0000 |
| commit | 5be75d5311695316f0d34448b98299cbe8b91ea5 (patch) | |
| tree | 4c51d81915c6575fc169ac51635f4875d212ed4e /src/northbridge/amd | |
| parent | 830e0de40187183c34a1f558d83b65068b649e2a (diff) | |
| download | coreboot-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/northbridge/amd')
| -rw-r--r-- | src/northbridge/amd/agesa/family12/northbridge.c | 4 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/family14/northbridge.c | 4 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/agesawrapper.c | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 290ab1647f..ab17d893bb 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -54,11 +54,7 @@ static struct dram_base_mask_t get_dram_base_mask(u32 nodeid) { struct device *dev; struct dram_base_mask_t d; -#if defined(__PRE_RAM__) - dev = PCI_DEV(0, DEV_CDB, 1); -#else dev = __f1_dev[0]; -#endif // defined(__PRE_RAM__) u32 temp; temp = pci_read_config32(dev, 0x44); //[39:24] at [31:16] diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index a52f7ec1f0..83329a29cf 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -52,11 +52,7 @@ static struct dram_base_mask_t get_dram_base_mask(u32 nodeid) { struct device *dev; struct dram_base_mask_t d; -#if defined(__PRE_RAM__) - dev = PCI_DEV(0, DEV_CDB, 1); -#else dev = __f1_dev[0]; -#endif // defined(__PRE_RAM__) u32 temp; temp = pci_read_config32(dev, 0x44); //[39:24] at [31:16] diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c index 1563216ba1..e3bfd90fd8 100644 --- a/src/northbridge/amd/pi/agesawrapper.c +++ b/src/northbridge/amd/pi/agesawrapper.c @@ -248,13 +248,15 @@ AGESA_STATUS agesawrapper_amdinitmid(void) return status; } -#ifndef __PRE_RAM__ AGESA_STATUS agesawrapper_amdinitlate(void) { AGESA_STATUS Status; AMD_INTERFACE_PARAMS AmdParamStruct; AMD_LATE_PARAMS *AmdLateParams; + if (!ENV_RAMSTAGE) + return AGESA_UNSUPPORTED; + LibAmdMemFill (&AmdParamStruct, 0, sizeof(AMD_INTERFACE_PARAMS), @@ -289,7 +291,6 @@ AGESA_STATUS agesawrapper_amdinitlate(void) /* No AmdReleaseStruct(&AmdParamStruct), we need AmdLateParams later. */ return Status; } -#endif /* #ifndef __PRE_RAM__ */ const void *agesawrapper_locate_module (const CHAR8 name[8]) { |