diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
| commit | 6674edaabfd271471608146806f5b6540bc76a1b (patch) | |
| tree | 574f8b5265002ad046aa1b81725a9483feb48a8d /doc/board | |
| parent | 4f8bf67f9c7fec8c5c1ae57c6ba24d337a19c578 (diff) | |
| parent | bb92678ced0b1594b93ab2f10b2c17750c789c96 (diff) | |
| download | u-boot-6674edaabfd271471608146806f5b6540bc76a1b.tar.xz | |
Merge tag 'v2021.10-rc4' into next
Prepare v2021.10-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# board/Arcturus/ucp1020/spl.c
# cmd/mvebu/Kconfig
# common/Kconfig.boot
# common/image-fit.c
# configs/UCP1020_defconfig
# configs/sifive_unmatched_defconfig
# drivers/pci/Kconfig
# include/configs/UCP1020.h
# include/configs/sifive-unmatched.h
# lib/Makefile
# scripts/config_whitelist.txt
Diffstat (limited to 'doc/board')
| -rw-r--r-- | doc/board/toradex/apalis-imx8.rst (renamed from doc/board/toradex/apalix-imx8.rst) | 0 | ||||
| -rw-r--r-- | doc/board/toradex/apalis-imx8x.rst (renamed from doc/board/toradex/apalix-imx8x.rst) | 0 | ||||
| -rw-r--r-- | doc/board/toradex/index.rst | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/doc/board/toradex/apalix-imx8.rst b/doc/board/toradex/apalis-imx8.rst index 29593faf1a..29593faf1a 100644 --- a/doc/board/toradex/apalix-imx8.rst +++ b/doc/board/toradex/apalis-imx8.rst diff --git a/doc/board/toradex/apalix-imx8x.rst b/doc/board/toradex/apalis-imx8x.rst index e62578b152..e62578b152 100644 --- a/doc/board/toradex/apalix-imx8x.rst +++ b/doc/board/toradex/apalis-imx8x.rst diff --git a/doc/board/toradex/index.rst b/doc/board/toradex/index.rst index abba648f86..5652848019 100644 --- a/doc/board/toradex/index.rst +++ b/doc/board/toradex/index.rst @@ -6,8 +6,8 @@ Toradex .. toctree:: :maxdepth: 2 - apalix-imx8 - apalix-imx8x + apalis-imx8 + apalis-imx8x colibri_imx7 colibri-imx8x verdin-imx8mm |