GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd: Remove Kconfig BOOTBLOCK_ADDR 

Due the location of X86_RESET_VECTOR, the anchor point
for linking the bootblock is at the end, which equals
ROMSTAGE_ADDR.

Change-Id: I2d25911582393c9a10fd3afa1a484eda2604d95a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48406
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Kyösti Mälkki 2020-12-04 19:51:17 +02:00 committed by Felix Held
parent 8d187f4d22
commit b3621f811d
4 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/amd/cezanne/Kconfig
View File

@ -47,12 +47,6 @@ config PRERAM_CBMEM_CONSOLE_SIZE
help help
Increase this value if preram cbmem console is getting truncated Increase this value if preram cbmem console is getting truncated
config BOOTBLOCK_ADDR
hex
default 0x2030000
help
Sets the address in DRAM where bootblock should be loaded.
config C_ENV_BOOTBLOCK_SIZE config C_ENV_BOOTBLOCK_SIZE
hex hex
default 0x10000 default 0x10000

15
src/soc/amd/common/block/cpu/noncar/memlayout_x86.ld
View File

@ -10,6 +10,9 @@
#define PSP_SHAREDMEM_DRAM_START(addr) SYMBOL(psp_sharedmem_dram, addr) #define PSP_SHAREDMEM_DRAM_START(addr) SYMBOL(psp_sharedmem_dram, addr)
#define PSP_SHAREDMEM_DRAM_END(addr) SYMBOL(epsp_sharedmem_dram, addr) #define PSP_SHAREDMEM_DRAM_END(addr) SYMBOL(epsp_sharedmem_dram, addr)
BOOTBLOCK_END = CONFIG_ROMSTAGE_ADDR;
BOOTBLOCK_ADDR = BOOTBLOCK_END - CONFIG_C_ENV_BOOTBLOCK_SIZE;
/* /*
* *
* +--------------------------------+ * +--------------------------------+
@ -31,11 +34,11 @@
* +--------------------------------+ FSP_M_ADDR * +--------------------------------+ FSP_M_ADDR
* | romstage | * | romstage |
* | (ROMSTAGE_SIZE) | * | (ROMSTAGE_SIZE) |
* +--------------------------------+ ROMSTAGE_ADDR * +--------------------------------+ ROMSTAGE_ADDR = BOOTBLOCK_END
* | | X86_RESET_VECTOR = BOOTBLOCK_ADDR + C_ENV_BOOTBLOCK_SIZE - 0x10 * | | X86_RESET_VECTOR = BOOTBLOCK_END - 0x10
* | bootblock | * | bootblock |
* | (C_ENV_BOOTBLOCK_SIZE) | * | (C_ENV_BOOTBLOCK_SIZE) |
* +--------------------------------+ BOOTBLOCK_ADDR * +--------------------------------+ BOOTBLOCK_ADDR = BOOTBLOCK_END - C_ENV_BOOTBLOCK_SIZE
* | Unused hole | * | Unused hole |
* +--------------------------------+ * +--------------------------------+
* | FMAP cache (FMAP_SIZE) | * | FMAP cache (FMAP_SIZE) |
@ -84,8 +87,8 @@ SECTIONS
#if CONFIG(VBOOT) #if CONFIG(VBOOT)
PSP_SHAREDMEM_DRAM_END(CONFIG_PSP_SHAREDMEM_BASE + CONFIG_PSP_SHAREDMEM_SIZE) PSP_SHAREDMEM_DRAM_END(CONFIG_PSP_SHAREDMEM_BASE + CONFIG_PSP_SHAREDMEM_SIZE)
#endif #endif
_ = ASSERT(CONFIG_BOOTBLOCK_ADDR == ((CONFIG_BOOTBLOCK_ADDR + 0xFFFF) & 0xFFFF0000), "Bootblock must be 16 bit aligned"); _ = ASSERT(BOOTBLOCK_END == ((BOOTBLOCK_END + 0xFFFF) & 0xFFFF0000), "Bootblock end must be 16 bit aligned");
BOOTBLOCK(CONFIG_BOOTBLOCK_ADDR, CONFIG_C_ENV_BOOTBLOCK_SIZE) BOOTBLOCK(BOOTBLOCK_ADDR, CONFIG_C_ENV_BOOTBLOCK_SIZE)
ROMSTAGE(CONFIG_ROMSTAGE_ADDR, CONFIG_ROMSTAGE_SIZE) ROMSTAGE(CONFIG_ROMSTAGE_ADDR, CONFIG_ROMSTAGE_SIZE)
REGION(fspm, CONFIG_FSP_M_ADDR, CONFIG_FSP_M_SIZE, 1) REGION(fspm, CONFIG_FSP_M_ADDR, CONFIG_FSP_M_SIZE, 1)
#if CONFIG(VBOOT_SEPARATE_VERSTAGE) #if CONFIG(VBOOT_SEPARATE_VERSTAGE)
@ -107,7 +110,7 @@ SECTIONS {
_TOO_LOW = _X86_RESET_VECTOR - 0xfff0; _TOO_LOW = _X86_RESET_VECTOR - 0xfff0;
_bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report."); _bogus = ASSERT(_start16bit >= _TOO_LOW, "_start16bit too low. Please report.");
. = CONFIG_BOOTBLOCK_ADDR + CONFIG_C_ENV_BOOTBLOCK_SIZE - 0x10; . = BOOTBLOCK_END - 0x10;
_X86_RESET_VECTOR = .; _X86_RESET_VECTOR = .;
.reset . : { .reset . : {
*(.reset); *(.reset);

6
src/soc/amd/picasso/Kconfig
View File

@ -120,12 +120,6 @@ config PRERAM_CBMEM_CONSOLE_SIZE
help help
Increase this value if preram cbmem console is getting truncated Increase this value if preram cbmem console is getting truncated
config BOOTBLOCK_ADDR
hex
default 0x2030000
help
Sets the address in DRAM where bootblock should be loaded.
config C_ENV_BOOTBLOCK_SIZE config C_ENV_BOOTBLOCK_SIZE
hex hex
default 0x10000 default 0x10000

6
src/soc/amd/picasso/root_complex.c
View File

@ -77,11 +77,11 @@ struct dptc_input {
* +--------------------------------+ FSP_M_ADDR * +--------------------------------+ FSP_M_ADDR
* | romstage | * | romstage |
* | (ROMSTAGE_SIZE) | * | (ROMSTAGE_SIZE) |
* +--------------------------------+ ROMSTAGE_ADDR * +--------------------------------+ ROMSTAGE_ADDR = BOOTBLOCK_END
* | | X86_RESET_VECTOR = BOOTBLOCK_ADDR + C_ENV_BOOTBLOCK_SIZE - 0x10 * | | X86_RESET_VECTOR = BOOTBLOCK_END - 0x10
* | bootblock | * | bootblock |
* | (C_ENV_BOOTBLOCK_SIZE) | * | (C_ENV_BOOTBLOCK_SIZE) |
* +--------------------------------+ BOOTBLOCK_ADDR * +--------------------------------+ BOOTBLOCK_ADDR = BOOTBLOCK_END - C_ENV_BOOTBLOCK_SIZE
* | Unused hole | * | Unused hole |
* | (86KiB) | * | (86KiB) |
* +--------------------------------+ * +--------------------------------+