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>
2020-05-25 08:52:07 +03:00 · 2020-05-25 08:52:07 +03:00 · e76ce871c8
parent 49dbbe99c2
commit e76ce871c8
25 changed files with 7 additions and 90 deletions
--- a/configs/config.facebook_fbg1701.mboot_vboot
+++ b/configs/config.facebook_fbg1701.mboot_vboot
@ -1,5 +1,4 @@
 CONFIG_VENDOR_FACEBOOK=y
-CONFIG_C_ENV_BOOTBLOCK_SIZE=0x6000
 CONFIG_ONBOARD_SAMSUNG_MEM=y
 CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF8B000
 CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@ -186,10 +186,13 @@ config HPET_ADDRESS
 	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
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@ -37,10 +37,6 @@ config DCACHE_BSP_STACK_SIZE
 	hex
 	default 0x4000

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x8000
-
 config ENABLE_MRC_CACHE
 	bool "Use cached memory configuration"
 	default n
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@ -36,10 +36,6 @@ config DCACHE_BSP_STACK_SIZE
 	hex
 	default 0x4000

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x8000
-
 endif # CPU_AMD_PI

 source "src/cpu/amd/pi/00630F01/Kconfig"
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@ -32,7 +32,6 @@ config DCACHE_BSP_STACK_SIZE

 config C_ENV_BOOTBLOCK_SIZE
 	hex
-	default 0x4000 if BOOTBLOCK_CONSOLE
-	default 0x2000
+	default 0x10000

 endif
--- a/src/cpu/intel/socket_441/Kconfig
+++ b/src/cpu/intel/socket_441/Kconfig
@ -10,10 +10,6 @@ config SOCKET_SPECIFIC_OPTIONS # dummy
 	select SSE
 	select SETUP_XIP_CACHE

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x8000
-
 config DCACHE_RAM_BASE
 	hex
 	default 0xfefc0000
--- a/src/cpu/intel/socket_m/Kconfig
+++ b/src/cpu/intel/socket_m/Kconfig
@ -22,8 +22,4 @@ config DCACHE_BSP_STACK_SIZE
 	hex
 	default 0x2000

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x8000
-
 endif
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@ -26,8 +26,4 @@ config MAX_CPUS
 	int
 	default 4

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x4000
-
 endif # BOARD_AOPEN_DXPLPLUSU
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@ -76,7 +76,7 @@ config DCACHE_RAM_SIZE

 config C_ENV_BOOTBLOCK_SIZE
 	hex
-	default 0x4000
+	default 0x10000

 config DCACHE_BSP_STACK_SIZE
 	hex
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@ -85,10 +85,6 @@ config HAVE_INTEL_FIRMWARE
 	bool
 	default n

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x4000
-
 config DCACHE_BSP_STACK_SIZE
 	hex
 	default 0x4000
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@ -92,10 +92,6 @@ config TPM_INIT
 	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
--- a/src/mainboard/portwell/m107/Kconfig
+++ b/src/mainboard/portwell/m107/Kconfig
@ -63,8 +63,4 @@ config SPI_FLASH_WINBOND
 	bool
 	default y

-config C_ENV_BOOTBLOCK_SIZE
-	hex "C Bootblock Size"
-	default 0x4000
-
 endif # BOARD_PORTWELL_M107
--- a/src/soc/intel/alderlake/Kconfig
+++ b/src/soc/intel/alderlake/Kconfig
@ -215,10 +215,6 @@ config VBOOT
 	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
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@ -52,10 +52,6 @@ config DCACHE_BSP_STACK_SIZE
 	  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
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@ -270,10 +270,6 @@ config VBOOT
 	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
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@ -157,10 +157,6 @@ config CONSOLE_UART_BASE_ADDRESS
 	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
--- a/src/soc/intel/elkhartlake/Kconfig
+++ b/src/soc/intel/elkhartlake/Kconfig
@ -183,10 +183,6 @@ config VBOOT
 	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
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@ -177,10 +177,6 @@ config VBOOT
 	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
--- a/src/soc/intel/jasperlake/Kconfig
+++ b/src/soc/intel/jasperlake/Kconfig
@ -183,10 +183,6 @@ config VBOOT
 	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
--- a/src/soc/intel/quark/Kconfig
+++ b/src/soc/intel/quark/Kconfig
@ -213,10 +213,6 @@ config DCACHE_BSP_STACK_SIZE
 	hex
 	default 0x4000

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0x8000
-
 #####
 # Test support
 #####
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@ -125,10 +125,6 @@ config DCACHE_BSP_STACK_SIZE
 	  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
--- a/src/soc/intel/tigerlake/Kconfig
+++ b/src/soc/intel/tigerlake/Kconfig
@ -211,10 +211,6 @@ config VBOOT
 	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
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@ -103,10 +103,6 @@ config MMCONF_BASE_ADDRESS
 	hex
 	default 0x80000000

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0xC000
-
 config HEAP_SIZE
 	hex
 	default 0x80000
--- a/src/soc/intel/xeon_sp/cpx/Kconfig
+++ b/src/soc/intel/xeon_sp/cpx/Kconfig
@ -68,10 +68,6 @@ config CPU_MICROCODE_CBFS_LEN
 	hex
 	default 0x7C00

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0xC000
-
 config HEAP_SIZE
 	hex
 	default 0x80000
--- a/src/soc/intel/xeon_sp/skx/Kconfig
+++ b/src/soc/intel/xeon_sp/skx/Kconfig
@ -51,10 +51,6 @@ config CPU_MICROCODE_CBFS_LEN
 	hex
 	default 0x7C00

-config C_ENV_BOOTBLOCK_SIZE
-	hex
-	default 0xC000
-
 config HEAP_SIZE
 	hex
 	default 0x80000