| Message ID | 20210927231820.810671-1-vladimir.oltean@nxp.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | configs: ls1028a: ensure Ethernet is enabled | expand |
On Tue, Sep 28, 2021 at 7:18 AM Vladimir Oltean <vladimir.oltean@nxp.com> wrote: > > CONFIG_FSL_ENETC is not explicitly enabled in the NXP LS1028A config > files, instead it is selected by CONFIG_MSCC_FELIX_SWITCH, a state of > matters which is fragile. > > CONFIG_MSCC_FELIX_SWITCH depends on CONFIG_DM_DSA, which depends on > CONFIG_PHY_FIXED. > > Not all LS1028A boards did enable CONFIG_PHY_FIXED, which resulted in > all of Ethernet being compiled out. > > This patch makes sure that CONFIG_PHY_FIXED is enabled for all LS1028A > boards, and CONFIG_FSL_ENETC as well - don't rely on that fragile > selection done by the Felix switch config. > > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> > --- > configs/kontron_sl28_defconfig | 1 + > configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + > configs/ls1028aqds_tfa_defconfig | 1 + > configs/ls1028aqds_tfa_lpuart_defconfig | 1 + > configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + > configs/ls1028ardb_tfa_defconfig | 1 + > 6 files changed, 6 insertions(+) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff --git a/configs/kontron_sl28_defconfig b/configs/kontron_sl28_defconfig index e15928bead29..d174dc722ca0 100644 --- a/configs/kontron_sl28_defconfig +++ b/configs/kontron_sl28_defconfig @@ -75,6 +75,7 @@ CONFIG_PHY_FIXED=y CONFIG_DM_DSA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_FSL_ENETC=y CONFIG_MSCC_FELIX_SWITCH=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig index 5b60c4af8d9b..855a353867f4 100644 --- a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig @@ -62,6 +62,7 @@ CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_DM_DSA=y CONFIG_E1000=y +CONFIG_FSL_ENETC=y CONFIG_MSCC_FELIX_SWITCH=y CONFIG_MDIO_MUX_I2CREG=y CONFIG_NVME=y diff --git a/configs/ls1028aqds_tfa_defconfig b/configs/ls1028aqds_tfa_defconfig index 311cfe3c7a2b..077824665317 100644 --- a/configs/ls1028aqds_tfa_defconfig +++ b/configs/ls1028aqds_tfa_defconfig @@ -67,6 +67,7 @@ CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y CONFIG_DM_DSA=y +CONFIG_FSL_ENETC=y CONFIG_E1000=y CONFIG_MSCC_FELIX_SWITCH=y CONFIG_MDIO_MUX_I2CREG=y diff --git a/configs/ls1028aqds_tfa_lpuart_defconfig b/configs/ls1028aqds_tfa_lpuart_defconfig index 6805f5eaaa18..eb5f85fc6b56 100644 --- a/configs/ls1028aqds_tfa_lpuart_defconfig +++ b/configs/ls1028aqds_tfa_lpuart_defconfig @@ -62,6 +62,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_AQUANTIA=y CONFIG_PHY_ATHEROS=y CONFIG_PHY_VITESSE=y +CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_DM_MDIO=y CONFIG_DM_MDIO_MUX=y diff --git a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig index 7eecbae13e75..c3de964ee329 100644 --- a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig @@ -58,6 +58,7 @@ CONFIG_DM_MDIO=y CONFIG_DM_DSA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_FSL_ENETC=y CONFIG_MSCC_FELIX_SWITCH=y CONFIG_NVME=y CONFIG_PCI=y diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index 6934a597a52c..69060ba752d1 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -64,6 +64,7 @@ CONFIG_DM_MDIO=y CONFIG_DM_DSA=y CONFIG_PHY_GIGE=y CONFIG_E1000=y +CONFIG_FSL_ENETC=y CONFIG_MSCC_FELIX_SWITCH=y CONFIG_NVME=y CONFIG_PCI=y
CONFIG_FSL_ENETC is not explicitly enabled in the NXP LS1028A config files, instead it is selected by CONFIG_MSCC_FELIX_SWITCH, a state of matters which is fragile. CONFIG_MSCC_FELIX_SWITCH depends on CONFIG_DM_DSA, which depends on CONFIG_PHY_FIXED. Not all LS1028A boards did enable CONFIG_PHY_FIXED, which resulted in all of Ethernet being compiled out. This patch makes sure that CONFIG_PHY_FIXED is enabled for all LS1028A boards, and CONFIG_FSL_ENETC as well - don't rely on that fragile selection done by the Felix switch config. Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com> --- configs/kontron_sl28_defconfig | 1 + configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028aqds_tfa_defconfig | 1 + configs/ls1028aqds_tfa_lpuart_defconfig | 1 + configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 + 6 files changed, 6 insertions(+)