* [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware"
@ 2021-02-03 21:36 Marek Vasut
2021-02-03 21:45 ` Tom Rini
2021-03-01 11:56 ` sbabic at denx.de
0 siblings, 2 replies; 4+ messages in thread
From: Marek Vasut @ 2021-02-03 21:36 UTC (permalink / raw)
To: u-boot
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 <marex@denx.de>
Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Ludwig Zenz <lzenz@dh-electronics.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Tom Rini <trini@konsulko.com>
---
configs/dh_imx6_defconfig | 3 ---
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 fce5b0dd451..6c7c7171a4a 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
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware"
2021-02-03 21:36 [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware" Marek Vasut
@ 2021-02-03 21:45 ` Tom Rini
2021-02-03 22:27 ` Marek Vasut
2021-03-01 11:56 ` sbabic at denx.de
1 sibling, 1 reply; 4+ messages in thread
From: Tom Rini @ 2021-02-03 21:45 UTC (permalink / raw)
To: u-boot
On Wed, Feb 03, 2021 at 10:36:33PM +0100, Marek Vasut wrote:
> 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 <marex@denx.de>
> Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Ludwig Zenz <lzenz@dh-electronics.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Tom Rini <trini@konsulko.com>
> ---
> configs/dh_imx6_defconfig | 3 ---
> 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 fce5b0dd451..6c7c7171a4a 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
Is this hunk needed since there is both CONFIG_SPL_DM_SPI{_FLASH,} and
CONFIG_DM_SPI{_FLASH,} ?
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210203/9b91ddfc/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware"
2021-02-03 21:45 ` Tom Rini
@ 2021-02-03 22:27 ` Marek Vasut
0 siblings, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2021-02-03 22:27 UTC (permalink / raw)
To: u-boot
On 2/3/21 10:45 PM, Tom Rini wrote:
[...]
>> diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
>> index fce5b0dd451..6c7c7171a4a 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
>
> Is this hunk needed since there is both CONFIG_SPL_DM_SPI{_FLASH,} and
> CONFIG_DM_SPI{_FLASH,} ?
Yes, we want to disable this only in SPL, not in U-Boot.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware"
2021-02-03 21:36 [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware" Marek Vasut
2021-02-03 21:45 ` Tom Rini
@ 2021-03-01 11:56 ` sbabic at denx.de
1 sibling, 0 replies; 4+ messages in thread
From: sbabic at denx.de @ 2021-03-01 11:56 UTC (permalink / raw)
To: u-boot
> 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 <marex@denx.de>
> Cc: Andreas Geisreiter <ageisreiter@dh-electronics.de>
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> Cc: Ludwig Zenz <lzenz@dh-electronics.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Tom Rini <trini@konsulko.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-01 11:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-03 21:36 [PATCH] ARM: imx: Revert "dh_imx6: Switch to full DM-aware" Marek Vasut
2021-02-03 21:45 ` Tom Rini
2021-02-03 22:27 ` Marek Vasut
2021-03-01 11:56 ` sbabic at denx.de
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.