The following patches will be adding other cases for SD1 lanes: 2x 40GE, 1x 40GE + 4x 10G and 1x 100GE + 4x 10G.
So "split" is no longer meaningful. Let's name each hwconfig value based on the SD1's lanes settings: 1x 100GE + 4x 25G. note: serdes1:split has only been in next, never in a release, so we should not need a compatibility alias. Signed-off-by: Vincent Jardin <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> --- (no changes since v5) Changes in v5: - Fix typos in the commit message Changes in v4: - New patch board/nxp/lx2160a/eth_lx2160aqds.c | 4 ++-- board/nxp/lx2160a/serdes_split.c | 4 ++-- board/nxp/lx2160a/serdes_split.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/nxp/lx2160a/eth_lx2160aqds.c b/board/nxp/lx2160a/eth_lx2160aqds.c index c1a060877cd..8f48b14c0e3 100644 --- a/board/nxp/lx2160a/eth_lx2160aqds.c +++ b/board/nxp/lx2160a/eth_lx2160aqds.c @@ -18,8 +18,8 @@ void reset_phy(void) { /* * Before the MC boots: it latches the live protocol-converter - * configuration when it starts, so `hwconfig=serdes1:split` has to - * be applied here and not later. + * configuration when it starts, so `hwconfig=serdes1:<mode>` has + * to be applied here and not later. */ lx2160a_serdes_apply_hwconfig(); diff --git a/board/nxp/lx2160a/serdes_split.c b/board/nxp/lx2160a/serdes_split.c index 6d9743a28dc..1a5c44e7740 100644 --- a/board/nxp/lx2160a/serdes_split.c +++ b/board/nxp/lx2160a/serdes_split.c @@ -409,13 +409,13 @@ int lx2160a_serdes1_split(void) } /* - * setenv hwconfig serdes1:split + * setenv hwconfig serdes1:100g4x25g * * Idempotent: a board whose PBI already split SD1 skip it too. */ void lx2160a_serdes_apply_hwconfig(void) { - if (!hwconfig_sub("serdes1", "split")) + if (!hwconfig_sub("serdes1", "100g4x25g")) return; if (lx2160a_serdes1_is_split()) diff --git a/board/nxp/lx2160a/serdes_split.h b/board/nxp/lx2160a/serdes_split.h index 67e8c4873a7..8dce9ddf97a 100644 --- a/board/nxp/lx2160a/serdes_split.h +++ b/board/nxp/lx2160a/serdes_split.h @@ -25,7 +25,7 @@ bool lx2160a_serdes1_is_split(void); int lx2160a_serdes1_split(void); /* - * Apply `hwconfig=serdes1:split` if the board's environment asks for it. + * Apply `hwconfig=serdes1:100g4x25g` if the board's environment asks for it. * Boards call this from reset_phy(), before mc_env_boot(). */ void lx2160a_serdes_apply_hwconfig(void); -- 2.43.0
