From e76ce871c8f84aef38fbf9df9c8bee3c10c085d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 25 May 2020 08:52:07 +0300 Subject: arch/x86: Remove most C_ENV_BOOTBLOCK_SIZE limits MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/47600 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- configs/config.facebook_fbg1701.mboot_vboot | 1 - src/arch/x86/Kconfig | 7 +++++-- src/cpu/amd/agesa/Kconfig | 4 ---- src/cpu/amd/pi/Kconfig | 4 ---- src/cpu/intel/slot_1/Kconfig | 3 +-- src/cpu/intel/socket_441/Kconfig | 4 ---- src/cpu/intel/socket_m/Kconfig | 4 ---- src/mainboard/aopen/dxplplusu/Kconfig | 4 ---- src/mainboard/emulation/qemu-i440fx/Kconfig | 2 +- src/mainboard/emulation/qemu-q35/Kconfig | 4 ---- src/mainboard/facebook/fbg1701/Kconfig | 4 ---- src/mainboard/portwell/m107/Kconfig | 4 ---- src/soc/intel/alderlake/Kconfig | 4 ---- src/soc/intel/braswell/Kconfig | 4 ---- src/soc/intel/cannonlake/Kconfig | 4 ---- src/soc/intel/denverton_ns/Kconfig | 4 ---- src/soc/intel/elkhartlake/Kconfig | 4 ---- src/soc/intel/icelake/Kconfig | 4 ---- src/soc/intel/jasperlake/Kconfig | 4 ---- src/soc/intel/quark/Kconfig | 4 ---- src/soc/intel/skylake/Kconfig | 4 ---- src/soc/intel/tigerlake/Kconfig | 4 ---- src/soc/intel/xeon_sp/Kconfig | 4 ---- src/soc/intel/xeon_sp/cpx/Kconfig | 4 ---- src/soc/intel/xeon_sp/skx/Kconfig | 4 ---- 25 files changed, 7 insertions(+), 90 deletions(-) diff --git a/configs/config.facebook_fbg1701.mboot_vboot b/configs/config.facebook_fbg1701.mboot_vboot index b372bbeb29..34d349a8cb 100644 --- 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 diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 943bb91d69..bb03db2fbc 100644 --- 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 diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig index b144fc1ca1..51b61a19be 100644 --- 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 diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig index d3a94a8c21..7b214f7aa0 100644 --- 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" diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig index 2b6deb6673..aafe110785 100644 --- 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 diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig index 7a303af08c..1b930de047 100644 --- 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 diff --git a/src/cpu/intel/socket_m/Kconfig b/src/cpu/intel/socket_m/Kconfig index 8b1f5edda5..32eedb6ef0 100644 --- 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 diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig index 0036915392..4ee9b73bdd 100644 --- 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 diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 1b618718b3..9b990ce908 100644 --- 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 diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig index d88d0da7ff..5a77ded9b3 100644 --- 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 diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig index 9e7ab69aac..e01f979dfc 100644 --- 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 diff --git a/src/mainboard/portwell/m107/Kconfig b/src/mainboard/portwell/m107/Kconfig index bc06151633..3935b38e80 100644 --- 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 diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index dd64592624..c67c424b2c 100644 --- 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 diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig index 001cab7960..c2522b2be7 100644 --- 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 diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index 259a4a04d3..49ec1b1b6d 100644 --- 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 diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig index 4fe491fce3..a7af6d587b 100644 --- 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 diff --git a/src/soc/intel/elkhartlake/Kconfig b/src/soc/intel/elkhartlake/Kconfig index 25aea15b07..4e7533583e 100644 --- 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 diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig index d1efa5570e..2fb0e6442f 100644 --- 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 diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 9e15a503f2..2b73aad9c7 100644 --- 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 diff --git a/src/soc/intel/quark/Kconfig b/src/soc/intel/quark/Kconfig index f8e967b32b..0b57b7e59b 100644 --- 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 ##### diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 0969a9b975..f06ef7285f 100644 --- 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 diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 8211d5650b..4962208d3a 100644 --- 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 diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig index fac66f7881..3dfc86fb3c 100644 --- 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 diff --git a/src/soc/intel/xeon_sp/cpx/Kconfig b/src/soc/intel/xeon_sp/cpx/Kconfig index ded69987ea..5f1e9a37b1 100644 --- 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 diff --git a/src/soc/intel/xeon_sp/skx/Kconfig b/src/soc/intel/xeon_sp/skx/Kconfig index 08242b12e7..0ff8114653 100644 --- 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 -- cgit v1.2.3