diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-16 14:23:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-16 14:23:30 -0500 |
| commit | 3144ba23bf4649f699078259fdf2e5cb4eab8f53 (patch) | |
| tree | f19391a1e5401b638c072cb654b5f32858f17a67 /arch | |
| parent | 2ffa0e87df3a7595f71d05782924ee83146d9fe7 (diff) | |
| parent | 4b32531be236bbd9ca60f26447511f79e214f79e (diff) | |
| download | u-boot-3144ba23bf4649f699078259fdf2e5cb4eab8f53.zip u-boot-3144ba23bf4649f699078259fdf2e5cb4eab8f53.tar.gz u-boot-3144ba23bf4649f699078259fdf2e5cb4eab8f53.tar.bz2 | |
Merge branch '2021-11-15-assorted-fixes'
- Rename "tqc" to "tq" and related updates
- Assorted minor ARM updates, build updates and documentation updates
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx6/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index f7fb772..eee7a21 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -210,7 +210,7 @@ ENTRY(memcpy) orr r9, r9, ip, lspush #\push mov ip, ip, lspull #\pull orr ip, ip, lr, lspush #\push - str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, , abort=19f + str8w r0, r3, r4, r5, r6, r7, r8, r9, ip, abort=19f bge 12b PLD( cmn r2, #96 ) PLD( bge 13b ) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index b4c8511..62de942 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -569,7 +569,7 @@ config TARGET_KP_IMX6Q_TPC imply CMD_SPL config TARGET_TQMA6 - bool "TQ Systems TQMa6 board" + bool "TQ-Systems TQMa6 board" select BOARD_EARLY_INIT_F select BOARD_LATE_INIT select MXC_SPI @@ -688,7 +688,7 @@ source "board/somlabs/visionsom-6ull/Kconfig" source "board/technexion/pico-imx6/Kconfig" source "board/technexion/pico-imx6ul/Kconfig" source "board/tbs/tbs2910/Kconfig" -source "board/tqc/tqma6/Kconfig" +source "board/tq/tqma6/Kconfig" source "board/toradex/apalis_imx6/Kconfig" source "board/toradex/colibri_imx6/Kconfig" source "board/toradex/colibri-imx6ull/Kconfig" |