diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-04 16:29:42 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-04 16:29:42 +0300 |
| commit | 143414c03fa72468fa8ce0d1ded21a4a616400f9 (patch) | |
| tree | 823d7657534ae619e6e937e2f7d303e64885fbab /arch/arm/lib | |
| parent | 8510580f2e85a8687b40fe5fc3d8c060e5278505 (diff) | |
| parent | ea0f768e2c835d2b77bdc1db7d4ab1416e45e432 (diff) | |
| download | u-boot-143414c03fa72468fa8ce0d1ded21a4a616400f9.tar.xz | |
Merge tag 'u-boot-imx-20200502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
i.MX for 2020.07
----------------
- imxrt: fix LCD clock, fix doc
- new board: Coral Dev
- imx8: enable Cache in SPL. SNVS, update SCFW API
- imx8MM: fix reset, 8MQ quand and QuadLite, CPU speed grading
- MX6ULL : is_imx6ull to include i.MX6ULZ
- Net: add config to enable TXC delay
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/682033914
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 8482f5446c..b839aa7a50 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -57,7 +57,7 @@ obj-y += interrupts_64.o else obj-y += interrupts.o endif -ifndef CONFIG_SYSRESET +ifndef CONFIG_$(SPL_TPL_)SYSRESET obj-y += reset.o endif |