arch/x86: Remove most C_ENV_BOOTBLOCK_SIZE limits
With top-aligned bootblock this is no longer globally needed.
The default maximum is now a generous 256 KiB with couple
platforms having lower limits of 32 KiB and 64 KiB.
Change-Id: Ib1aee44908c0dcbc17978d3ee53bd05a6200410c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47600
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 943bb91..bb03db2 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -186,10 +186,13 @@
hex
default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
-# 64KiB default bootblock size
config C_ENV_BOOTBLOCK_SIZE
hex
- default 0x10000
+ default 0x40000 if !FIXED_BOOTBLOCK_SIZE
+ help
+ This is only the default maximum of bootblock size for linking
+ purposes. Platforms may provide different limit and need to
+ specify this when FIXED_BOOTBLOCK_SIZE is selected.
config FIXED_BOOTBLOCK_SIZE
bool
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index b144fc1..51b61a1 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -37,10 +37,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 d3a94a8c..7b214f7 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -36,10 +36,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 2b6deb6..aafe110 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -32,7 +32,6 @@
config C_ENV_BOOTBLOCK_SIZE
hex
- default 0x4000 if BOOTBLOCK_CONSOLE
- default 0x2000
+ default 0x10000
endif
diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig
index 7a303af..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 0x8000
-
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 1b61871..9b990ce 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -76,7 +76,7 @@
config C_ENV_BOOTBLOCK_SIZE
hex
- default 0x4000
+ default 0x10000
config DCACHE_BSP_STACK_SIZE
hex
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index d88d0da..5a77ded 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -85,10 +85,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/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index 9e7ab69..e01f979 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -92,10 +92,6 @@
bool "TPM Setup in RAMSTAGE"
default n
-config C_ENV_BOOTBLOCK_SIZE
- hex "C Bootblock Size"
- default 0x4000
-
config VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST
depends on USE_VENDORCODE_ELTAN
bool
diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig
index bc06151..3935b38 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/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig
index dd64592..c67c424 100644
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@@ -215,10 +215,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/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 001cab7..c2522b2 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -52,10 +52,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 259a4a0..49ec1b1 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -270,10 +270,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 4fe491f..a7af6d5 100644
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@@ -157,10 +157,6 @@
hex "MMIO base address for UART"
default 0xd4000000
-config C_ENV_BOOTBLOCK_SIZE
- hex
- default 0x8000
-
choice
prompt "Cache-as-ram implementation"
default USE_DENVERTON_NS_CAR_NEM_ENHANCED
diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig
index 25aea15..4e75335 100644
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@@ -183,10 +183,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/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index d1efa55..2fb0e64 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -177,10 +177,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 9e15a50..2b73aad 100644
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@@ -183,10 +183,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 f8e967b..0b57b7e 100644
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@@ -213,10 +213,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 0969a9b..f06ef72 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -125,10 +125,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 8211d56..4962208 100644
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@@ -211,10 +211,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 fac66f7..3dfc86f 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -103,10 +103,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 ded6998..5f1e9a3 100644
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@@ -68,10 +68,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 08242b1..0ff8114 100644
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@@ -51,10 +51,6 @@
hex
default 0x7C00
-config C_ENV_BOOTBLOCK_SIZE
- hex
- default 0xC000
-
config HEAP_SIZE
hex
default 0x80000