Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41695 )
Change subject: [WIP] arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
[WIP] arch/x86: Remove C_ENV_BOOTBLOCK_SIZE
With top-aligned bootblock this is no longer needed.
Change-Id: Ib1aee44908c0dcbc17978d3ee53bd05a6200410c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/Kconfig M src/cpu/amd/agesa/Kconfig M src/cpu/amd/pi/Kconfig M src/cpu/intel/slot_1/Kconfig M src/cpu/intel/socket_441/Kconfig M src/cpu/intel/socket_m/Kconfig M src/mainboard/aopen/dxplplusu/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-q35/Kconfig M src/mainboard/portwell/m107/Kconfig M src/soc/amd/picasso/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/icelake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/quark/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/soc/intel/xeon_sp/cpx/Kconfig M src/soc/intel/xeon_sp/skx/Kconfig M src/southbridge/intel/i82371eb/bootblock.c 24 files changed, 8 insertions(+), 94 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41695/1
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 6c6aade..9de45ec 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -180,11 +180,6 @@ hex default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
-# 64KiB default bootblock size -config C_ENV_BOOTBLOCK_SIZE - hex - default 0x10000 - # Default address romstage is to be linked at config ROMSTAGE_ADDR hex diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig index 35e2f93..9d4f7e0 100644 --- a/src/cpu/amd/agesa/Kconfig +++ b/src/cpu/amd/agesa/Kconfig @@ -41,10 +41,6 @@ hex default 0x4000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - config ENABLE_MRC_CACHE bool "Use cached memory configuration" default n diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig index bc12538..6b7a143 100644 --- a/src/cpu/amd/pi/Kconfig +++ b/src/cpu/amd/pi/Kconfig @@ -41,10 +41,6 @@ hex default 0x4000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - endif # CPU_AMD_PI
source "src/cpu/amd/pi/00630F01/Kconfig" diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig index 6928335..841b796 100644 --- a/src/cpu/intel/slot_1/Kconfig +++ b/src/cpu/intel/slot_1/Kconfig @@ -30,8 +30,4 @@ hex default 0x1000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x2000 - endif diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig index af43f72..1b930de 100644 --- a/src/cpu/intel/socket_441/Kconfig +++ b/src/cpu/intel/socket_441/Kconfig @@ -10,10 +10,6 @@ select SSE select SETUP_XIP_CACHE
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x4000 - config DCACHE_RAM_BASE hex default 0xfefc0000 diff --git a/src/cpu/intel/socket_m/Kconfig b/src/cpu/intel/socket_m/Kconfig index 8b1f5ed..32eedb6 100644 --- a/src/cpu/intel/socket_m/Kconfig +++ b/src/cpu/intel/socket_m/Kconfig @@ -22,8 +22,4 @@ hex default 0x2000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - endif diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig index 0036915..4ee9b73 100644 --- a/src/mainboard/aopen/dxplplusu/Kconfig +++ b/src/mainboard/aopen/dxplplusu/Kconfig @@ -26,8 +26,4 @@ int default 4
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x4000 - endif # BOARD_AOPEN_DXPLPLUSU diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 3c27b1e..75f1cb8 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -63,10 +63,6 @@ hex default 0x90000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x4000 - config DCACHE_BSP_STACK_SIZE hex default 0x4000 diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index 6a0903d..f45b3c4 100644 --- a/src/mainboard/emulation/qemu-q35/Kconfig +++ b/src/mainboard/emulation/qemu-q35/Kconfig @@ -76,10 +76,6 @@ bool default n
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x4000 - config DCACHE_BSP_STACK_SIZE hex default 0x4000 diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig index f813b8e..25d1f7a 100644 --- a/src/mainboard/portwell/m107/Kconfig +++ b/src/mainboard/portwell/m107/Kconfig @@ -63,8 +63,4 @@ bool default y
-config C_ENV_BOOTBLOCK_SIZE - hex "C Bootblock Size" - default 0x4000 - endif # BOARD_PORTWELL_M107 diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index ce1f074..d26e03b 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -72,6 +72,10 @@ int default 64
+config C_ENV_BOOTBLOCK_SIZE + hex + default 0x10000 + config VERSTAGE_ADDR hex default 0x4000000 diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 9118b18..7a91368 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -158,10 +158,6 @@ default 133
# 32KiB bootblock is all that is mapped in by the CSE at top of 4GiB. -config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - # This SoC does not map SPI flash like many previous SoC. Therefore we provide # a custom media driver that facilitates mapping config X86_TOP4G_BOOTMEDIA_MAP diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index a437db2..ecbeabe 100644 --- a/src/soc/intel/braswell/Kconfig +++ b/src/soc/intel/braswell/Kconfig @@ -54,10 +54,6 @@ The amount of anticipated stack usage in CAR by bootblock and other stages.
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - config VBOOT select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_STARTS_IN_ROMSTAGE diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 6a86576..5114de0 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -266,10 +266,6 @@ select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config CBFS_SIZE hex default 0x200000 diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig index df0823f..cde17eb 100644 --- a/src/soc/intel/denverton_ns/Kconfig +++ b/src/soc/intel/denverton_ns/Kconfig @@ -161,10 +161,6 @@ hex "MMIO base address for UART" default 0xd4000000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - config DENVERTON_NS_CAR_NEM_ENHANCED bool "Enhanced Non-evict mode" depends on !FSP_CAR diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig index 2a5156b..931179e 100644 --- a/src/soc/intel/icelake/Kconfig +++ b/src/soc/intel/icelake/Kconfig @@ -171,10 +171,6 @@ select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config CBFS_SIZE hex default 0x200000 diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index bfefbf2..b59236b 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -178,10 +178,6 @@ select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config CBFS_SIZE hex default 0x200000 diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig index 4ecf6c1..3acd13f 100644 --- a/src/soc/intel/quark/Kconfig +++ b/src/soc/intel/quark/Kconfig @@ -216,10 +216,6 @@ hex default 0x4000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0x8000 - ##### # Test support ##### diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 55437f3..d308692 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -121,10 +121,6 @@ The amount of anticipated stack usage in CAR by bootblock and other stages.
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config EXCLUDE_NATIVE_SD_INTERFACE bool default n diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index e0d29fb..86dd697 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -176,10 +176,6 @@ select VBOOT_VBNV_CMOS select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config CBFS_SIZE hex default 0x200000 diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index e07de9b..8a4f67f 100644 --- a/src/soc/intel/xeon_sp/Kconfig +++ b/src/soc/intel/xeon_sp/Kconfig @@ -96,10 +96,6 @@ hex default 0x80000000
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config HEAP_SIZE hex default 0x80000 diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig index 86fdf1b..3b34471 100644 --- a/src/soc/intel/xeon_sp/cpx/Kconfig +++ b/src/soc/intel/xeon_sp/cpx/Kconfig @@ -54,10 +54,6 @@ hex default 0x7C00
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config HEAP_SIZE hex default 0x80000 diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig index 7af0b58..6cd8e7c 100644 --- a/src/soc/intel/xeon_sp/skx/Kconfig +++ b/src/soc/intel/xeon_sp/skx/Kconfig @@ -55,10 +55,6 @@ hex default 0x7C00
-config C_ENV_BOOTBLOCK_SIZE - hex - default 0xC000 - config HEAP_SIZE hex default 0x80000 diff --git a/src/southbridge/intel/i82371eb/bootblock.c b/src/southbridge/intel/i82371eb/bootblock.c index 05b2d2c..6a1f654 100644 --- a/src/southbridge/intel/i82371eb/bootblock.c +++ b/src/southbridge/intel/i82371eb/bootblock.c @@ -22,11 +22,10 @@ }
/* TODO: Does not need to happen before console init. */ -/* The whole rom is not accessible before this so limit - the bootblock size. */ -#if CONFIG_C_ENV_BOOTBLOCK_SIZE > 0x10000 -#error "CONFIG_C_ENV_BOOTBLOCK_SIZE needs to be below 64KiB" -#endif +/* + * TODO: The whole rom is not accessible before this so bootblock size + * is limited to 64 KiB. This should be asserted build-time, but it is not. + */ void bootblock_early_southbridge_init(void) { u16 reg16;
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41695 )
Change subject: [WIP] arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... File src/southbridge/intel/i82371eb/bootblock.c:
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... PS2, Line 28: */ Isn't it better to create a solution for this before merging it? After all it can result in a (semi) bricked system.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41695 )
Change subject: [WIP] arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... File src/southbridge/intel/i82371eb/bootblock.c:
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... PS2, Line 28: */
Isn't it better to create a solution for this before merging it? After all it can result in a (semi) […]
The bootblock on systems with i82371eb is currently just over 4 KiB, if it grows over 64 KiB some builds could fail. So we are currently very far away from reaching the limit and I did not immediately see a good place to place build-time asserts.
Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41695 )
Change subject: [WIP] arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... File src/southbridge/intel/i82371eb/bootblock.c:
https://review.coreboot.org/c/coreboot/+/41695/2/src/southbridge/intel/i8237... PS2, Line 28: */
The bootblock on systems with i82371eb is currently just over 4 KiB, if it grows over 64 KiB some bu […]
Your right and I guess the main use for this code is the qemu support. A "bricked" qemu isn't a big issue anyhow.
Hello build bot (Jenkins), David Guckian, Frans Hendriks, Vanessa Eusebio, Andrey Petrov, Patrick Rudolph, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41695
to look at the new patch set (#3).
Change subject: arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
arch/x86: Remove C_ENV_BOOTBLOCK_SIZE
With top-aligned bootblock this is no longer globally needed.
Change-Id: Ib1aee44908c0dcbc17978d3ee53bd05a6200410c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M configs/config.facebook_fbg1701.mboot_vboot M src/arch/x86/Kconfig M src/cpu/amd/agesa/Kconfig M src/cpu/amd/pi/Kconfig M src/cpu/intel/slot_1/Kconfig M src/cpu/intel/socket_441/Kconfig M src/cpu/intel/socket_m/Kconfig M src/mainboard/aopen/dxplplusu/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-q35/Kconfig M src/mainboard/facebook/fbg1701/Kconfig M src/mainboard/portwell/m107/Kconfig M src/soc/amd/picasso/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/icelake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/quark/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/soc/intel/xeon_sp/cpx/Kconfig M src/soc/intel/xeon_sp/skx/Kconfig M src/southbridge/intel/i82371eb/bootblock.c 26 files changed, 8 insertions(+), 99 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41695/3
Hello build bot (Jenkins), Raul Rangel, Furquan Shaikh, David Guckian, Frans Hendriks, Vanessa Eusebio, Andrey Petrov, Aaron Durbin, Patrick Rudolph, Felix Held, Wim Vervoorn,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/41695
to look at the new patch set (#4).
Change subject: arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
arch/x86: Remove C_ENV_BOOTBLOCK_SIZE
With top-aligned bootblock this is no longer globally needed.
Change-Id: Ib1aee44908c0dcbc17978d3ee53bd05a6200410c Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M configs/config.facebook_fbg1701.mboot_vboot M src/arch/x86/Kconfig M src/cpu/amd/agesa/Kconfig M src/cpu/amd/pi/Kconfig M src/cpu/intel/slot_1/Kconfig M src/cpu/intel/socket_441/Kconfig M src/cpu/intel/socket_m/Kconfig M src/mainboard/aopen/dxplplusu/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-q35/Kconfig M src/mainboard/facebook/fbg1701/Kconfig M src/mainboard/portwell/m107/Kconfig M src/soc/intel/apollolake/Kconfig M src/soc/intel/braswell/Kconfig M src/soc/intel/cannonlake/Kconfig M src/soc/intel/denverton_ns/Kconfig M src/soc/intel/icelake/Kconfig M src/soc/intel/jasperlake/Kconfig M src/soc/intel/quark/Kconfig M src/soc/intel/skylake/Kconfig M src/soc/intel/tigerlake/Kconfig M src/soc/intel/xeon_sp/Kconfig M src/soc/intel/xeon_sp/cpx/Kconfig M src/soc/intel/xeon_sp/skx/Kconfig M src/southbridge/intel/i82371eb/bootblock.c 25 files changed, 4 insertions(+), 100 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/41695/4
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/41695 )
Change subject: arch/x86: Remove C_ENV_BOOTBLOCK_SIZE ......................................................................
Abandoned
-
Kyösti Mälkki (Code Review) -
Wim Vervoorn (Code Review)