diff options
| author | Tom Rini <[email protected]> | 2021-05-17 10:01:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-05-17 10:01:56 -0400 |
| commit | feddbdb55f47b94f9f6695dc19a826953f893f7a (patch) | |
| tree | 0548162461ec8301549ed2303be59faed4add4c6 /cmd | |
| parent | 7e1d0a8f17547f7aeedad0681753f260c8e60196 (diff) | |
| parent | e1c55dfc7b59e8e49fc400290b3bea8066b74de1 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- Add base support for Marvell OcteonTX2 CN9130 DB (mostly done
by Kostya)
- Sync Armada 8k MMU setup with Marvell version (misc Marvell
authors)
- spi: kirkwood: Some fixes especially for baudrate generation
(misc Marvell authors)
- mvebu: x530: Reduce SPL image size (Stefan)
- Rename "rx_training" to "mvebu_comphy_rx_training" (Stefan)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mvebu/Kconfig | 9 | ||||
| -rw-r--r-- | cmd/mvebu/Makefile | 2 | ||||
| -rw-r--r-- | cmd/mvebu/comphy_rx_training.c (renamed from cmd/mvebu/rx_training.c) | 10 |
3 files changed, 10 insertions, 11 deletions
diff --git a/cmd/mvebu/Kconfig b/cmd/mvebu/Kconfig index f0e4f884d70..7c42c75afbe 100644 --- a/cmd/mvebu/Kconfig +++ b/cmd/mvebu/Kconfig @@ -49,11 +49,10 @@ config MVEBU_UBOOT_DFLT_NAME This option should contain a default file name to be used with MVEBU "bubt" command if the source file name is omitted -config CMD_MVEBU_RX_TRAINING - bool "rx_training" - depends on TARGET_MVEBU_ARMADA_8K - default n +config CMD_MVEBU_COMPHY_RX_TRAINING + bool "mvebu_comphy_rx_training" + depends on ARMADA_8K help - Perform RX training sequence + Perform COMPHY RX training sequence endmenu diff --git a/cmd/mvebu/Makefile b/cmd/mvebu/Makefile index 79299b0814f..ca96ad01d91 100644 --- a/cmd/mvebu/Makefile +++ b/cmd/mvebu/Makefile @@ -5,4 +5,4 @@ # https://spdx.org/licenses obj-$(CONFIG_CMD_MVEBU_BUBT) += bubt.o -obj-$(CONFIG_CMD_MVEBU_RX_TRAINING) += rx_training.o +obj-$(CONFIG_CMD_MVEBU_COMPHY_RX_TRAINING) += comphy_rx_training.o diff --git a/cmd/mvebu/rx_training.c b/cmd/mvebu/comphy_rx_training.c index 4bae7653aca..0798decfae1 100644 --- a/cmd/mvebu/rx_training.c +++ b/cmd/mvebu/comphy_rx_training.c @@ -13,8 +13,8 @@ #include <dm/device-internal.h> #include <mvebu/comphy.h> -int rx_training_cmd(struct cmd_tbl *cmdtp, int flag, int argc, - char * const argv[]) +int mvebu_comphy_rx_training_cmd(struct cmd_tbl *cmdtp, int flag, int argc, + char * const argv[]) { struct udevice *dev; struct uclass *uc; @@ -51,7 +51,7 @@ int rx_training_cmd(struct cmd_tbl *cmdtp, int flag, int argc, } U_BOOT_CMD( - rx_training, 3, 0, rx_training_cmd, - "rx_training <cp id> <comphy id>\n", - "\n\tRun RX training sequence, the user must state CP index (0/1) and comphy ID (0/5)" + mvebu_comphy_rx_training, 3, 0, mvebu_comphy_rx_training_cmd, + "mvebu_comphy_rx_training <cp id> <comphy id>\n", + "\n\tRun COMPHY RX training sequence, the user must state CP index (0/1) and comphy ID (0/5)" ); |