diff options
| author | Zev Weiss <zev@bewilderbeest.net> | 2024-02-01 03:48:31 +0300 |
|---|---|---|
| committer | Zev Weiss <zev@bewilderbeest.net> | 2024-02-09 01:46:37 +0300 |
| commit | 5b7203bd5ba7bdf6ead2c839e396119174af6c0e (patch) | |
| tree | 39f210ec23a97b5aa9f82aabc7b41a1c4716a59d /meta-asrock | |
| parent | 2b289d1dd2502961cc7c857996e7bf3fbb7736c7 (diff) | |
| download | openbmc-5b7203bd5ba7bdf6ead2c839e396119174af6c0e.tar.xz | |
meta-asrock: Generalize MMC/SDHCI reset quirk
As it turns out, e3c256d4i isn't the only board with this problem,
so move the u-boot config fragment to meta-common and make it available
via an override.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: I7182a6a1dd12603fec1d0633edc60d018285914f
Diffstat (limited to 'meta-asrock')
6 files changed, 12 insertions, 6 deletions
diff --git a/meta-asrock/meta-common/recipes-bsp/u-boot/files/disable-mmc-sdhci.cfg b/meta-asrock/meta-common/recipes-bsp/u-boot/files/disable-mmc-sdhci.cfg new file mode 100644 index 0000000000..83f2a31f27 --- /dev/null +++ b/meta-asrock/meta-common/recipes-bsp/u-boot/files/disable-mmc-sdhci.cfg @@ -0,0 +1,5 @@ +# Needed as a bug workaround -- due to (apparently) a missing pull-up resistor +# on the reset lines of some ASRock boards, u-boot switching the pinctrl when +# it binds its mmc driver blips the line and resets the host; disabling the +# driver (which isn't needed on those platforms) prevents that. +CONFIG_MMC_SDHCI_ASPEED=n diff --git a/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..a4d89c0696 --- /dev/null +++ b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-aspeed-sdk_%.bbappend @@ -0,0 +1 @@ +require u-boot-common-aspeed-sdk.inc diff --git a/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-common-aspeed-sdk.inc b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-common-aspeed-sdk.inc new file mode 100644 index 0000000000..fd129d2a72 --- /dev/null +++ b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-common-aspeed-sdk.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +SRC_URI:append:asrock-mmc-sdhci-reset-quirk = " file://disable-mmc-sdhci.cfg" diff --git a/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend new file mode 100644 index 0000000000..a4d89c0696 --- /dev/null +++ b/meta-asrock/meta-common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed-sdk_%.bbappend @@ -0,0 +1 @@ +require u-boot-common-aspeed-sdk.inc diff --git a/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf b/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf index d86a973782..119653731f 100644 --- a/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf +++ b/meta-asrock/meta-e3c256d4i/conf/machine/e3c256d4i.conf @@ -19,3 +19,5 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" VIRTUAL-RUNTIME_obmc-inventory-manager = "entity-manager" VIRTUAL-RUNTIME_obmc-sensors-hwmon = "dbus-sensors" + +MACHINEOVERRIDES =. "asrock-mmc-sdhci-reset-quirk:" diff --git a/meta-asrock/meta-e3c256d4i/recipes-bsp/u-boot/files/e3c256d4i.cfg b/meta-asrock/meta-e3c256d4i/recipes-bsp/u-boot/files/e3c256d4i.cfg index 8bbe1b21c2..a2874d0389 100644 --- a/meta-asrock/meta-e3c256d4i/recipes-bsp/u-boot/files/e3c256d4i.cfg +++ b/meta-asrock/meta-e3c256d4i/recipes-bsp/u-boot/files/e3c256d4i.cfg @@ -1,9 +1,3 @@ -# Needed as a bug workaround -- due to (apparently) a missing pull-up resistor -# on the reset line, u-boot switching the pinctrl when it binds its mmc driver -# glitches the line and resets the host; disabling the driver (which we don't -# need) prevents that. -CONFIG_MMC_SDHCI_ASPEED=n - # Unfortunately the host needs access to the ast2500 Super-IO in order to # configure the UART for its serial console CONFIG_ASPEED_ALLOW_DANGEROUS_BACKDOORS=y |