| Message ID | 20200429130428.124788-1-hws@denx.de |
|---|---|
| Headers | show |
| Series | ARM: imx: Fix reset in SPL | expand |
Hi folks, On Wed, Apr 29, 2020 at 10:04 AM Harald Seiler <hws at denx.de> wrote: > > This series is a merge of "ARM: Fix reset in SPL if SYSRESET is not > used" [1] and "ARM: imx: Do not define do_reset() if sysreset is > enabled" [2] as the two solve the same problem. > > The first of the two was sent to originally to fix a problem not related > to imx8m (see the last patch of this new series, "ARM: reset: use > do_reset in SPL/TPL if SYSRESET was not enabled for them"). However, > this broke imx8m boards as they define do_reset() in board code which > was the reason for adding the imx8m patches. > > Now, Marek sent the latter series which solves the specific issues of > the imx8m boards properly by converting them to use DM_SYSRESET in SPL. > > This approach is better than what Claudius and I did originally so I've > dropped our (non-DM) fixes for the imx8m boards and added Marek's > patches instead. I have, however, kept the fixes for the generic code > so if anyone would go back to using the non-DM version, it would also > work (and not be part of the tree while silently being broken). > > [1]: https://patchwork.ozlabs.org/project/uboot/list/?series=162379 > [2]: https://patchwork.ozlabs.org/project/uboot/list/?series=173249 Nice work! For the entire series: Reviewed-by: Fabio Estevam <festevam at gmail.com>
This series is a merge of "ARM: Fix reset in SPL if SYSRESET is not used" [1] and "ARM: imx: Do not define do_reset() if sysreset is enabled" [2] as the two solve the same problem. The first of the two was sent to originally to fix a problem not related to imx8m (see the last patch of this new series, "ARM: reset: use do_reset in SPL/TPL if SYSRESET was not enabled for them"). However, this broke imx8m boards as they define do_reset() in board code which was the reason for adding the imx8m patches. Now, Marek sent the latter series which solves the specific issues of the imx8m boards properly by converting them to use DM_SYSRESET in SPL. This approach is better than what Claudius and I did originally so I've dropped our (non-DM) fixes for the imx8m boards and added Marek's patches instead. I have, however, kept the fixes for the generic code so if anyone would go back to using the non-DM version, it would also work (and not be part of the tree while silently being broken). [1]: https://patchwork.ozlabs.org/project/uboot/list/?series=162379 [2]: https://patchwork.ozlabs.org/project/uboot/list/?series=173249 Claudius Heine (2): ARM: imx8m: Don't use the addr parameter of reset_cpu() ARM: reset: use do_reset in SPL/TPL if SYSRESET was not enabled for them Harald Seiler (1): ARM: imx8m: Fix indentation of reset_cpu() function Marek Vasut (5): ARM: imx8m: Do not define do_reset() if sysreset is enabled ARM: imx8m: Fix reset in SPL on NXP iMX8MM EVK ARM: imx8m: Fix reset in SPL on NXP iMX8MN EVK ARM: imx8m: Fix reset in SPL on NXP iMX8MP EVK ARM: imx8m: Fix reset in SPL on Toradex iMX8MM Verdin arch/arm/dts/imx8mm-evk-u-boot.dtsi | 12 ++++++++++++ arch/arm/dts/imx8mm-verdin-u-boot.dtsi | 12 ++++++++++++ arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 12 ++++++++++++ arch/arm/dts/imx8mp-evk-u-boot.dtsi | 12 ++++++++++++ arch/arm/lib/Makefile | 2 +- arch/arm/mach-imx/imx8m/soc.c | 21 +++++++++------------ board/freescale/imx8mm_evk/spl.c | 9 --------- board/freescale/imx8mn_evk/spl.c | 9 --------- board/freescale/imx8mp_evk/spl.c | 9 --------- board/toradex/verdin-imx8mm/spl.c | 9 --------- configs/imx8mm_evk_defconfig | 5 +++++ configs/imx8mn_ddr4_evk_defconfig | 5 +++++ configs/imx8mp_evk_defconfig | 4 ++++ configs/verdin-imx8mm_defconfig | 5 +++++ 14 files changed, 77 insertions(+), 49 deletions(-)