diff options
| author | Marek Vasut <[email protected]> | 2021-02-03 22:36:33 +0100 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2021-02-27 16:56:05 +0100 |
| commit | 58cbf2eff5b9f254cb129b18448ebe04f10a2275 (patch) | |
| tree | e215e2f6f33c3c7b7d0eafe590da622c21a57239 | |
| parent | 08cca188c120b8337600091c94dc0e211cd03e10 (diff) | |
ARM: imx: Revert "dh_imx6: Switch to full DM-aware"
This reverts commit 03a673cf49e ("dh_imx6: Switch to full DM-aware").
According to discussion [1], the patch is known to break the dh_imx6
board, however it made it upstream just before 2021.01-rc4, likely by
mistake. Revert this patch to put the board back into working order.
Also note that this board has no DM SPL support due to OCRAM size
limitations, but that is fine, as SPL DM support is optional.
[1] https://lists.denx.de/pipermail/u-boot/2020-June/417986.html
Signed-off-by: Marek Vasut <[email protected]>
Cc: Andreas Geisreiter <[email protected]>
Cc: Jagan Teki <[email protected]>
Cc: Ludwig Zenz <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tom Rini <[email protected]>
| -rw-r--r-- | configs/dh_imx6_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/dh_imx6.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 7bb6ce168ae..0a667fbae97 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -54,14 +54,12 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_EXT4_WRITE=y CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6q-dhcom-pdk2 imx6dl-dhcom-pdk2" CONFIG_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_SPL_DM=y CONFIG_BOUNCE_BUFFER=y CONFIG_DWC_AHSATA=y CONFIG_BOOTCOUNT_LIMIT=y @@ -108,5 +106,4 @@ CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y -# CONFIG_SPL_WDT is not set CONFIG_BZIP2=y diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 4a469af5e60..008a70a7c2e 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -52,6 +52,12 @@ /* SATA Configs */ #define CONFIG_LBA48 +/* SPI Flash Configs */ +#if defined(CONFIG_SPL_BUILD) +#undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH +#endif + /* UART */ #define CONFIG_MXC_UART_BASE UART1_BASE |