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>
This commit is contained in:
parent
49dbbe99c2
commit
e76ce871c8
|
@ -1,5 +1,4 @@
|
||||||
CONFIG_VENDOR_FACEBOOK=y
|
CONFIG_VENDOR_FACEBOOK=y
|
||||||
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x6000
|
|
||||||
CONFIG_ONBOARD_SAMSUNG_MEM=y
|
CONFIG_ONBOARD_SAMSUNG_MEM=y
|
||||||
CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF8B000
|
CONFIG_CPU_MICROCODE_CBFS_LOC=0xFFF8B000
|
||||||
CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
|
CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
|
||||||
|
|
|
@ -186,10 +186,13 @@ config HPET_ADDRESS
|
||||||
hex
|
hex
|
||||||
default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
|
default 0xfed00000 if !HPET_ADDRESS_OVERRIDE
|
||||||
|
|
||||||
# 64KiB default bootblock size
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
config C_ENV_BOOTBLOCK_SIZE
|
||||||
hex
|
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
|
config FIXED_BOOTBLOCK_SIZE
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -37,10 +37,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000
|
default 0x4000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
config ENABLE_MRC_CACHE
|
config ENABLE_MRC_CACHE
|
||||||
bool "Use cached memory configuration"
|
bool "Use cached memory configuration"
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -36,10 +36,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000
|
default 0x4000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
endif # CPU_AMD_PI
|
endif # CPU_AMD_PI
|
||||||
|
|
||||||
source "src/cpu/amd/pi/00630F01/Kconfig"
|
source "src/cpu/amd/pi/00630F01/Kconfig"
|
||||||
|
|
|
@ -32,7 +32,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
config C_ENV_BOOTBLOCK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000 if BOOTBLOCK_CONSOLE
|
default 0x10000
|
||||||
default 0x2000
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -10,10 +10,6 @@ config SOCKET_SPECIFIC_OPTIONS # dummy
|
||||||
select SSE
|
select SSE
|
||||||
select SETUP_XIP_CACHE
|
select SETUP_XIP_CACHE
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
config DCACHE_RAM_BASE
|
config DCACHE_RAM_BASE
|
||||||
hex
|
hex
|
||||||
default 0xfefc0000
|
default 0xfefc0000
|
||||||
|
|
|
@ -22,8 +22,4 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x2000
|
default 0x2000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -26,8 +26,4 @@ config MAX_CPUS
|
||||||
int
|
int
|
||||||
default 4
|
default 4
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x4000
|
|
||||||
|
|
||||||
endif # BOARD_AOPEN_DXPLPLUSU
|
endif # BOARD_AOPEN_DXPLPLUSU
|
||||||
|
|
|
@ -76,7 +76,7 @@ config DCACHE_RAM_SIZE
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
config C_ENV_BOOTBLOCK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000
|
default 0x10000
|
||||||
|
|
||||||
config DCACHE_BSP_STACK_SIZE
|
config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
|
|
|
@ -85,10 +85,6 @@ config HAVE_INTEL_FIRMWARE
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x4000
|
|
||||||
|
|
||||||
config DCACHE_BSP_STACK_SIZE
|
config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000
|
default 0x4000
|
||||||
|
|
|
@ -92,10 +92,6 @@ config TPM_INIT
|
||||||
bool "TPM Setup in RAMSTAGE"
|
bool "TPM Setup in RAMSTAGE"
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex "C Bootblock Size"
|
|
||||||
default 0x4000
|
|
||||||
|
|
||||||
config VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST
|
config VENDORCODE_ELTAN_VBOOT_SIGNED_MANIFEST
|
||||||
depends on USE_VENDORCODE_ELTAN
|
depends on USE_VENDORCODE_ELTAN
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -63,8 +63,4 @@ config SPI_FLASH_WINBOND
|
||||||
bool
|
bool
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex "C Bootblock Size"
|
|
||||||
default 0x4000
|
|
||||||
|
|
||||||
endif # BOARD_PORTWELL_M107
|
endif # BOARD_PORTWELL_M107
|
||||||
|
|
|
@ -215,10 +215,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -52,10 +52,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
The amount of anticipated stack usage in CAR by bootblock and
|
The amount of anticipated stack usage in CAR by bootblock and
|
||||||
other stages.
|
other stages.
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_MUST_REQUEST_DISPLAY
|
select VBOOT_MUST_REQUEST_DISPLAY
|
||||||
select VBOOT_STARTS_IN_ROMSTAGE
|
select VBOOT_STARTS_IN_ROMSTAGE
|
||||||
|
|
|
@ -270,10 +270,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -157,10 +157,6 @@ config CONSOLE_UART_BASE_ADDRESS
|
||||||
hex "MMIO base address for UART"
|
hex "MMIO base address for UART"
|
||||||
default 0xd4000000
|
default 0xd4000000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Cache-as-ram implementation"
|
prompt "Cache-as-ram implementation"
|
||||||
default USE_DENVERTON_NS_CAR_NEM_ENHANCED
|
default USE_DENVERTON_NS_CAR_NEM_ENHANCED
|
||||||
|
|
|
@ -183,10 +183,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -177,10 +177,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -183,10 +183,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -213,10 +213,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000
|
default 0x4000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0x8000
|
|
||||||
|
|
||||||
#####
|
#####
|
||||||
# Test support
|
# Test support
|
||||||
#####
|
#####
|
||||||
|
|
|
@ -125,10 +125,6 @@ config DCACHE_BSP_STACK_SIZE
|
||||||
The amount of anticipated stack usage in CAR by bootblock and
|
The amount of anticipated stack usage in CAR by bootblock and
|
||||||
other stages.
|
other stages.
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config EXCLUDE_NATIVE_SD_INTERFACE
|
config EXCLUDE_NATIVE_SD_INTERFACE
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -211,10 +211,6 @@ config VBOOT
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
select VBOOT_VBNV_CMOS_BACKUP_TO_FLASH
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config CBFS_SIZE
|
config CBFS_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x200000
|
default 0x200000
|
||||||
|
|
|
@ -103,10 +103,6 @@ config MMCONF_BASE_ADDRESS
|
||||||
hex
|
hex
|
||||||
default 0x80000000
|
default 0x80000000
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config HEAP_SIZE
|
config HEAP_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
|
@ -68,10 +68,6 @@ config CPU_MICROCODE_CBFS_LEN
|
||||||
hex
|
hex
|
||||||
default 0x7C00
|
default 0x7C00
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config HEAP_SIZE
|
config HEAP_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
|
@ -51,10 +51,6 @@ config CPU_MICROCODE_CBFS_LEN
|
||||||
hex
|
hex
|
||||||
default 0x7C00
|
default 0x7C00
|
||||||
|
|
||||||
config C_ENV_BOOTBLOCK_SIZE
|
|
||||||
hex
|
|
||||||
default 0xC000
|
|
||||||
|
|
||||||
config HEAP_SIZE
|
config HEAP_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x80000
|
default 0x80000
|
||||||
|
|
Loading…
Reference in New Issue