summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-08-04 18:11:02 +0300
committerTom Rini <trini@konsulko.com>2020-08-04 18:11:02 +0300
commitf1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (patch)
tree694f503767f8511bffc8c5e6360f542e50428a0d /arch/arm/Kconfig
parent993b59f0451cb102f23714478a64361b44694fc6 (diff)
parent3e980a2d8bd13d0d1c2d5cec9e57a47b6cff8b92 (diff)
downloadu-boot-f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1.tar.xz
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10 ----------- - fixes for Toradex board - fix warnings from previous PR - HAB: reset instead of panic after failure - new board: MYiR Tech MYS-6ULX - mx6cuboxi: use OF_PLATDATA - further changes for DM Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/714513163
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d3ac8e1f47..6b8a32c38d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1940,6 +1940,7 @@ source "board/hisilicon/hikey/Kconfig"
source "board/hisilicon/hikey960/Kconfig"
source "board/hisilicon/poplar/Kconfig"
source "board/isee/igep003x/Kconfig"
+source "board/myir/mys_6ulx/Kconfig"
source "board/spear/spear300/Kconfig"
source "board/spear/spear310/Kconfig"
source "board/spear/spear320/Kconfig"