payloads/tianocore: Increase default timeout for SD MMC init to 10ms
Firstly, change the unit of `μs` to `ms` so it's easier to read.
This patch changes the default amount of time allowed to initialise
SD Card Readers and eMMC drives from 1ms to 10ms. Having a timeout
too short will stop certain devices from booting, which was seen on
google/akemi; it throws an exception when attempting to boot from
the internal eMMC drive.
This new value is still lower than upstream edk2's value of 1s.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Id1f66d5d50f889f07a34836ab2932b28ef7fb245
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65813
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
diff --git a/payloads/external/tianocore/Kconfig b/payloads/external/tianocore/Kconfig
index d30386e..1de7c71 100644
--- a/payloads/external/tianocore/Kconfig
+++ b/payloads/external/tianocore/Kconfig
@@ -169,11 +169,11 @@
Include support for PS/2 keyboards
config TIANOCORE_SD_MMC_TIMEOUT
- int "Timeout in μs for initializing SD Card reader"
- default 1000
+ int "Timeout in ms for initializing SD and eMMC devices"
+ default 10
help
The amount of time allowed to initialize the SD Card reader and/or eMMC drive.
- Most only require 1000μs, but certain readers can take 1000000μs.
+ Most only require 10ms, but certain readers can take 1s.
config TIANOCORE_SERIAL_SUPPORT
bool "Support serial output"
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 7a3119e..49e49dd 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -78,7 +78,7 @@
endif
# SD_MMC_TIMEOUT = 1000000
ifneq ($(CONFIG_TIANOCORE_SD_MMC_TIMEOUT),)
-BUILD_STR += -D SD_MMC_TIMEOUT=$(CONFIG_TIANOCORE_SD_MMC_TIMEOUT)
+BUILD_STR += -D SD_MMC_TIMEOUT=$(call int-multiply, $(CONFIG_TIANOCORE_SD_MMC_TIMEOUT) 1000)
endif
#
# EDKII has the below PCDs that are revalant to coreboot: