Skip to content

Commit 4a93f0f

Browse files
gaspar-ilomgaspar-ilom
committed
use native raminit with haswell boards
Signed-off-by: gaspar-ilom <[email protected]>
1 parent 00374d7 commit 4a93f0f

File tree

6 files changed

+38
-78
lines changed

6 files changed

+38
-78
lines changed

‎blobs/haswell/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎blobs/haswell/obtain-mrc‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
4949

5050
# Make the Coreboot build depend on the following 3rd party blobs:
5151
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
52-
$(pwd)/blobs/haswell/mrc.bin $(pwd)/blobs/t440p/me.bin
53-
54-
$(pwd)/blobs/haswell/mrc.bin:
55-
COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
56-
$(pwd)/blobs/haswell/obtain-mrc $(pwd)/blobs/haswell
52+
$(pwd)/blobs/t440p/me.bin
5753

5854
$(pwd)/blobs/t440p/me.bin:
5955
COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \

‎boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,7 @@ export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
4949

5050
# Make the Coreboot build depend on the following 3rd party blobs:
5151
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
52-
$(pwd)/blobs/haswell/mrc.bin $(pwd)/blobs/w541/me.bin
53-
54-
$(pwd)/blobs/haswell/mrc.bin:
55-
COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
56-
$(pwd)/blobs/haswell/obtain-mrc $(pwd)/blobs/haswell
52+
$(pwd)/blobs/w541/me.bin
5753

5854
$(pwd)/blobs/w541/me.bin:
5955
COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \

‎config/coreboot-t440p.config‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CONFIG_COMPILER_GCC=y
1818
# CONFIG_UTIL_GENPARSER is not set
1919
CONFIG_OPTION_BACKEND_NONE=y
2020
# CONFIG_USE_OPTION_TABLE is not set
21+
# CONFIG_USE_CBFS_FILE_OPTION_BACKEND is not set
2122
CONFIG_COMPRESS_RAMSTAGE_LZMA=y
2223
# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set
2324
CONFIG_SEPARATE_ROMSTAGE=y
@@ -92,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
9293
# CONFIG_VENDOR_LIBRETREND is not set
9394
# CONFIG_VENDOR_MITAC_COMPUTING is not set
9495
# CONFIG_VENDOR_MSI is not set
96+
# CONFIG_VENDOR_NOVACUSTOM is not set
9597
# CONFIG_VENDOR_OCP is not set
9698
# CONFIG_VENDOR_OPENCELLULAR is not set
9799
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -153,9 +155,9 @@ CONFIG_MAX_SOCKET=1
153155
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
154156
CONFIG_TPM_PIRQ=0x0
155157
CONFIG_DCACHE_RAM_BASE=0xff7c0000
156-
CONFIG_DCACHE_RAM_SIZE=0x10000
158+
CONFIG_DCACHE_RAM_SIZE=0x40000
157159
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
158-
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
160+
CONFIG_DCACHE_BSP_STACK_SIZE=0x20000
159161
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
160162
CONFIG_HAVE_INTEL_FIRMWARE=y
161163
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -176,11 +178,10 @@ CONFIG_HAVE_IFD_BIN=y
176178
CONFIG_BOARD_LENOVO_THINKPAD_T440P=y
177179
# CONFIG_BOARD_LENOVO_THINKPAD_W541 is not set
178180
# CONFIG_BOARD_LENOVO_L520 is not set
181+
# CONFIG_BOARD_LENOVO_M900 is not set
179182
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
180183
# CONFIG_BOARD_LENOVO_M920Q is not set
181184
# CONFIG_BOARD_LENOVO_S230U is not set
182-
# CONFIG_BOARD_LENOVO_T480 is not set
183-
# CONFIG_BOARD_LENOVO_T480S is not set
184185
# CONFIG_BOARD_LENOVO_T400 is not set
185186
# CONFIG_BOARD_LENOVO_T500 is not set
186187
# CONFIG_BOARD_LENOVO_R400 is not set
@@ -220,7 +221,6 @@ CONFIG_PS2K_EISAID="LEN0071"
220221
CONFIG_PS2M_EISAID="LEN0036"
221222
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
222223
CONFIG_GFX_GMA_PANEL_1_PORT="eDP"
223-
CONFIG_LENOVO_TBFW_BIN=""
224224
CONFIG_D3COLD_SUPPORT=y
225225
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
226226
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -285,9 +285,7 @@ CONFIG_INTEL_GMA_BCLV_WIDTH=16
285285
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
286286
CONFIG_INTEL_GMA_BCLM_WIDTH=16
287287
CONFIG_BOOTBLOCK_IN_CBFS=y
288-
CONFIG_HAVE_MRC=y
289-
CONFIG_MRC_FILE="@BLOB_DIR@/haswell/mrc.bin"
290-
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
288+
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
291289
CONFIG_HPET_MIN_TICKS=0x80
292290
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
293291
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
@@ -321,6 +319,7 @@ CONFIG_UDELAY_TSC=y
321319
CONFIG_TSC_MONOTONIC_TIMER=y
322320
CONFIG_TSC_SYNC_MFENCE=y
323321
CONFIG_HAVE_SMI_HANDLER=y
322+
CONFIG_CPU_PT_ROM_MAP_GB=512
324323
CONFIG_SMM_TSEG=y
325324
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
326325
CONFIG_AP_STACK_SIZE=0x800
@@ -338,9 +337,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
338337
# Northbridge
339338
#
340339
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
341-
# CONFIG_USE_NATIVE_RAMINIT is not set
342-
# CONFIG_USE_BROADWELL_MRC is not set
343-
CONFIG_HASWELL_HIDE_PEG_FROM_MRC=y
340+
CONFIG_USE_NATIVE_RAMINIT=y
344341

345342
#
346343
# Southbridge
@@ -503,6 +500,7 @@ CONFIG_HAVE_USBDEBUG=y
503500
CONFIG_HAVE_USBDEBUG_OPTIONS=y
504501
# CONFIG_USBDEBUG is not set
505502
# CONFIG_VPD is not set
503+
# CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG is not set
506504
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
507505
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
508506
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
@@ -696,6 +694,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
696694
# General Debug Settings
697695
#
698696
# CONFIG_DEBUG_CBFS is not set
697+
CONFIG_HAVE_DEBUG_RAM_SETUP=y
698+
# CONFIG_DEBUG_RAM_SETUP is not set
699699
CONFIG_HAVE_DEBUG_SMBUS=y
700700
# CONFIG_DEBUG_SMBUS is not set
701701
# CONFIG_DEBUG_MALLOC is not set
@@ -714,6 +714,13 @@ CONFIG_HWBASE_DYNAMIC_MMIO=y
714714
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
715715
CONFIG_HWBASE_DIRECT_PCIDEV=y
716716
CONFIG_DECOMPRESS_OFAST=y
717+
718+
#
719+
# Boot Logo Configuration
720+
#
721+
# CONFIG_BMP_LOGO is not set
722+
# end of Boot Logo Configuration
723+
717724
CONFIG_WARNINGS_ARE_ERRORS=y
718725
CONFIG_MAX_REBOOT_CNT=3
719726
CONFIG_RELOCATABLE_MODULES=y

‎config/coreboot-w541.config‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CONFIG_COMPILER_GCC=y
1818
# CONFIG_UTIL_GENPARSER is not set
1919
CONFIG_OPTION_BACKEND_NONE=y
2020
# CONFIG_USE_OPTION_TABLE is not set
21+
# CONFIG_USE_CBFS_FILE_OPTION_BACKEND is not set
2122
CONFIG_COMPRESS_RAMSTAGE_LZMA=y
2223
# CONFIG_COMPRESS_RAMSTAGE_LZ4 is not set
2324
CONFIG_SEPARATE_ROMSTAGE=y
@@ -92,6 +93,7 @@ CONFIG_VENDOR_LENOVO=y
9293
# CONFIG_VENDOR_LIBRETREND is not set
9394
# CONFIG_VENDOR_MITAC_COMPUTING is not set
9495
# CONFIG_VENDOR_MSI is not set
96+
# CONFIG_VENDOR_NOVACUSTOM is not set
9597
# CONFIG_VENDOR_OCP is not set
9698
# CONFIG_VENDOR_OPENCELLULAR is not set
9799
# CONFIG_VENDOR_PACKARDBELL is not set
@@ -153,9 +155,9 @@ CONFIG_MAX_SOCKET=1
153155
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
154156
CONFIG_TPM_PIRQ=0x0
155157
CONFIG_DCACHE_RAM_BASE=0xff7c0000
156-
CONFIG_DCACHE_RAM_SIZE=0x10000
158+
CONFIG_DCACHE_RAM_SIZE=0x40000
157159
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
158-
CONFIG_DCACHE_BSP_STACK_SIZE=0x2000
160+
CONFIG_DCACHE_BSP_STACK_SIZE=0x20000
159161
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
160162
CONFIG_HAVE_INTEL_FIRMWARE=y
161163
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
@@ -176,11 +178,10 @@ CONFIG_HAVE_IFD_BIN=y
176178
# CONFIG_BOARD_LENOVO_THINKPAD_T440P is not set
177179
CONFIG_BOARD_LENOVO_THINKPAD_W541=y
178180
# CONFIG_BOARD_LENOVO_L520 is not set
181+
# CONFIG_BOARD_LENOVO_M900 is not set
179182
# CONFIG_BOARD_LENOVO_THINKCENTRE_M900_TINY is not set
180183
# CONFIG_BOARD_LENOVO_M920Q is not set
181184
# CONFIG_BOARD_LENOVO_S230U is not set
182-
# CONFIG_BOARD_LENOVO_T480 is not set
183-
# CONFIG_BOARD_LENOVO_T480S is not set
184185
# CONFIG_BOARD_LENOVO_T400 is not set
185186
# CONFIG_BOARD_LENOVO_T500 is not set
186187
# CONFIG_BOARD_LENOVO_R400 is not set
@@ -220,7 +221,6 @@ CONFIG_PS2K_EISAID="LEN0071"
220221
CONFIG_PS2M_EISAID="LEN004A"
221222
CONFIG_THINKPADEC_HKEY_EISAID="LEN0068"
222223
CONFIG_GFX_GMA_PANEL_1_PORT="DP3"
223-
CONFIG_LENOVO_TBFW_BIN=""
224224
CONFIG_D3COLD_SUPPORT=y
225225
CONFIG_GFX_GMA_PANEL_1_ON_EDP=y
226226
# CONFIG_DRIVERS_UART_8250IO is not set
@@ -285,9 +285,7 @@ CONFIG_INTEL_GMA_BCLV_WIDTH=16
285285
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
286286
CONFIG_INTEL_GMA_BCLM_WIDTH=16
287287
CONFIG_BOOTBLOCK_IN_CBFS=y
288-
CONFIG_HAVE_MRC=y
289-
CONFIG_MRC_FILE="@BLOB_DIR@/haswell/mrc.bin"
290-
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x30000
288+
CONFIG_DCACHE_RAM_MRC_VAR_SIZE=0x0
291289
CONFIG_HPET_MIN_TICKS=0x80
292290
CONFIG_FIXED_MCHBAR_MMIO_BASE=0xfed10000
293291
CONFIG_FIXED_DMIBAR_MMIO_BASE=0xfed18000
@@ -321,6 +319,7 @@ CONFIG_UDELAY_TSC=y
321319
CONFIG_TSC_MONOTONIC_TIMER=y
322320
CONFIG_TSC_SYNC_MFENCE=y
323321
CONFIG_HAVE_SMI_HANDLER=y
322+
CONFIG_CPU_PT_ROM_MAP_GB=512
324323
CONFIG_SMM_TSEG=y
325324
CONFIG_SMM_PCI_RESOURCE_STORE_NUM_SLOTS=8
326325
CONFIG_AP_STACK_SIZE=0x800
@@ -338,9 +337,7 @@ CONFIG_CPU_MICROCODE_CBFS_DEFAULT_BINS=y
338337
# Northbridge
339338
#
340339
CONFIG_NORTHBRIDGE_INTEL_HASWELL=y
341-
# CONFIG_USE_NATIVE_RAMINIT is not set
342-
# CONFIG_USE_BROADWELL_MRC is not set
343-
CONFIG_HASWELL_HIDE_PEG_FROM_MRC=y
340+
CONFIG_USE_NATIVE_RAMINIT=y
344341

345342
#
346343
# Southbridge
@@ -503,6 +500,7 @@ CONFIG_HAVE_USBDEBUG=y
503500
CONFIG_HAVE_USBDEBUG_OPTIONS=y
504501
# CONFIG_USBDEBUG is not set
505502
# CONFIG_VPD is not set
503+
# CONFIG_DRIVERS_EMULATION_QEMU_FW_CFG is not set
506504
# CONFIG_DRIVERS_GENERIC_CBFS_SERIAL is not set
507505
# CONFIG_DRIVERS_GENERIC_CBFS_UUID is not set
508506
# CONFIG_DRIVERS_GENESYSLOGIC_GL9750 is not set
@@ -695,6 +693,8 @@ CONFIG_COMPRESS_SECONDARY_PAYLOAD=y
695693
# General Debug Settings
696694
#
697695
# CONFIG_DEBUG_CBFS is not set
696+
CONFIG_HAVE_DEBUG_RAM_SETUP=y
697+
# CONFIG_DEBUG_RAM_SETUP is not set
698698
CONFIG_HAVE_DEBUG_SMBUS=y
699699
# CONFIG_DEBUG_SMBUS is not set
700700
# CONFIG_DEBUG_MALLOC is not set
@@ -713,6 +713,13 @@ CONFIG_HWBASE_DYNAMIC_MMIO=y
713713
CONFIG_HWBASE_DEFAULT_MMCONF=0xf0000000
714714
CONFIG_HWBASE_DIRECT_PCIDEV=y
715715
CONFIG_DECOMPRESS_OFAST=y
716+
717+
#
718+
# Boot Logo Configuration
719+
#
720+
# CONFIG_BMP_LOGO is not set
721+
# end of Boot Logo Configuration
722+
716723
CONFIG_WARNINGS_ARE_ERRORS=y
717724
CONFIG_MAX_REBOOT_CNT=3
718725
CONFIG_RELOCATABLE_MODULES=y

0 commit comments

Comments
 (0)