diff options
| author | Fred Reitberger <reitbergerfred@gmail.com> | 2023-02-08 13:05:05 -0500 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-02-13 13:45:27 +0000 |
| commit | 4064677fde9fe57c672fd16563e674d38a1b94eb (patch) | |
| tree | 31c3dcccacc8c7b3a9a10e457b3a4e8ed239314d | |
| parent | 0ef9d890fabe1b4fd2a525acd49ae7dcb74aab2a (diff) | |
soc/amd/phoenix: Expand APOB to 256K
APOB on Phoenix is larger, so expand the reserved DRAM and MRC_CACHE
regions to fit. This requires moving memory addresses around to prevent
overlapping memory linker errors.
TEST='./util/scripts/testsoc -K PHOENIX -K GLINDA' successfully builds
all boards
Signed-off-by: Fred Reitberger <reitbergerfred@gmail.com>
Change-Id: I42af7230ca5f09ba66b2b3c4f99ac3feac7feeea
Reviewed-on: https://review.coreboot.org/c/coreboot/+/72905
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
| -rw-r--r-- | src/mainboard/amd/birman/board_phoenix.fmd | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/birman/chromeos_phoenix.fmd | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/board.fmd | 2 | ||||
| -rw-r--r-- | src/mainboard/amd/mayan/chromeos.fmd | 2 | ||||
| -rw-r--r-- | src/soc/amd/phoenix/Kconfig | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/amd/birman/board_phoenix.fmd b/src/mainboard/amd/birman/board_phoenix.fmd index 32c7a5a6dd..6f7af56ecb 100644 --- a/src/mainboard/amd/birman/board_phoenix.fmd +++ b/src/mainboard/amd/birman/board_phoenix.fmd @@ -3,6 +3,6 @@ FLASH@0xFF000000 16M { EC 4K FMAP 4K COREBOOT(CBFS) - RW_MRC_CACHE 120K + RW_MRC_CACHE 256K } } diff --git a/src/mainboard/amd/birman/chromeos_phoenix.fmd b/src/mainboard/amd/birman/chromeos_phoenix.fmd index 538dfbd1c6..dca61fc552 100644 --- a/src/mainboard/amd/birman/chromeos_phoenix.fmd +++ b/src/mainboard/amd/birman/chromeos_phoenix.fmd @@ -29,6 +29,6 @@ FLASH@0xFF000000 16M { RW_NVRAM(PRESERVE) 20K SMMSTORE(PRESERVE) 64K RW_LEGACY(CBFS) - RW_MRC_CACHE(PRESERVE) 120K + RW_MRC_CACHE(PRESERVE) 256K } } diff --git a/src/mainboard/amd/mayan/board.fmd b/src/mainboard/amd/mayan/board.fmd index 32c7a5a6dd..6f7af56ecb 100644 --- a/src/mainboard/amd/mayan/board.fmd +++ b/src/mainboard/amd/mayan/board.fmd @@ -3,6 +3,6 @@ FLASH@0xFF000000 16M { EC 4K FMAP 4K COREBOOT(CBFS) - RW_MRC_CACHE 120K + RW_MRC_CACHE 256K } } diff --git a/src/mainboard/amd/mayan/chromeos.fmd b/src/mainboard/amd/mayan/chromeos.fmd index 538dfbd1c6..dca61fc552 100644 --- a/src/mainboard/amd/mayan/chromeos.fmd +++ b/src/mainboard/amd/mayan/chromeos.fmd @@ -29,6 +29,6 @@ FLASH@0xFF000000 16M { RW_NVRAM(PRESERVE) 20K SMMSTORE(PRESERVE) 64K RW_LEGACY(CBFS) - RW_MRC_CACHE(PRESERVE) 120K + RW_MRC_CACHE(PRESERVE) 256K } } diff --git a/src/soc/amd/phoenix/Kconfig b/src/soc/amd/phoenix/Kconfig index 03cf8366ff..b108c8f2da 100644 --- a/src/soc/amd/phoenix/Kconfig +++ b/src/soc/amd/phoenix/Kconfig @@ -116,11 +116,11 @@ config PSP_APOB_DRAM_ADDRESS config PSP_APOB_DRAM_SIZE hex - default 0x1E000 + default 0x40000 config PSP_SHAREDMEM_BASE hex - default 0x201F000 if VBOOT + default 0x2041000 if VBOOT default 0x0 help This variable defines the base address in DRAM memory where PSP copies @@ -165,7 +165,7 @@ config C_ENV_BOOTBLOCK_SIZE config ROMSTAGE_ADDR hex - default 0x2040000 + default 0x2060000 help Sets the address in DRAM where romstage should be loaded. @@ -177,7 +177,7 @@ config ROMSTAGE_SIZE config FSP_M_ADDR hex - default 0x20C0000 + default 0x20E0000 help Sets the address in DRAM where FSP-M should be loaded. cbfstool performs relocation of FSP-M to this address. @@ -197,7 +197,7 @@ config FSP_TEMP_RAM_SIZE config VERSTAGE_ADDR hex depends on VBOOT_SEPARATE_VERSTAGE - default 0x2180000 + default 0x21A0000 help Sets the address in DRAM where verstage should be loaded if running as a separate stage on x86. |