diff mbox series

[u-boot,v2019.04-aspeed-openbmc,4/4] config: aspeed: Enable NCSI support

Message ID 20220610080059.2333501-5-joel@jms.id.au
State New
Headers show
Series Better NCSI support | expand

Commit Message

Joel Stanley June 10, 2022, 8 a.m. UTC 
Now that NCSI can be enabled without breaking non-NCSI systems, enable
it in all defconfigs.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 configs/ast2600-pfr_defconfig            | 1 +
 configs/ast2600_openbmc_defconfig        | 1 +
 configs/evb-ast2400_defconfig            | 1 +
 configs/evb-ast2500-spl_defconfig        | 1 +
 configs/evb-ast2500_defconfig            | 1 +
 configs/evb-ast2600-cot_defconfig        | 1 +
 configs/evb-ast2600_defconfig            | 1 +
 configs/evb-ast2600a0-cot_defconfig      | 1 +
 configs/evb-ast2600a0-spl_defconfig      | 1 +
 configs/evb-ast2600a0_defconfig          | 1 +
 configs/evb-ast2600a1-cot_defconfig      | 1 +
 configs/evb-ast2600a1-ecc_defconfig      | 1 +
 configs/evb-ast2600a1-emmc-cot_defconfig | 1 +
 configs/evb-ast2600a1-emmc_defconfig     | 1 +
 configs/evb-ast2600a1-spl-ecc_defconfig  | 1 +
 configs/evb-ast2600a1-spl_defconfig      | 1 +
 configs/evb-ast2600a1_defconfig          | 1 +
 17 files changed, 17 insertions(+)

Comments

Cédric Le Goater June 10, 2022, 9:31 a.m. UTC | #1 
On 6/10/22 10:00, Joel Stanley wrote:
> Now that NCSI can be enabled without breaking non-NCSI systems, enable
> it in all defconfigs.
> 
> Signed-off-by: Joel Stanley <joel@jms.id.au>

You should add :

CONFIG_CMD_NCSI=y

C.

> ---
>   configs/ast2600-pfr_defconfig            | 1 +
>   configs/ast2600_openbmc_defconfig        | 1 +
>   configs/evb-ast2400_defconfig            | 1 +
>   configs/evb-ast2500-spl_defconfig        | 1 +
>   configs/evb-ast2500_defconfig            | 1 +
>   configs/evb-ast2600-cot_defconfig        | 1 +
>   configs/evb-ast2600_defconfig            | 1 +
>   configs/evb-ast2600a0-cot_defconfig      | 1 +
>   configs/evb-ast2600a0-spl_defconfig      | 1 +
>   configs/evb-ast2600a0_defconfig          | 1 +
>   configs/evb-ast2600a1-cot_defconfig      | 1 +
>   configs/evb-ast2600a1-ecc_defconfig      | 1 +
>   configs/evb-ast2600a1-emmc-cot_defconfig | 1 +
>   configs/evb-ast2600a1-emmc_defconfig     | 1 +
>   configs/evb-ast2600a1-spl-ecc_defconfig  | 1 +
>   configs/evb-ast2600a1-spl_defconfig      | 1 +
>   configs/evb-ast2600a1_defconfig          | 1 +
>   17 files changed, 17 insertions(+)
> 
> diff --git a/configs/ast2600-pfr_defconfig b/configs/ast2600-pfr_defconfig
> index 398e55d0f3d4..dbe87e35a635 100644
> --- a/configs/ast2600-pfr_defconfig
> +++ b/configs/ast2600-pfr_defconfig
> @@ -120,6 +120,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/ast2600_openbmc_defconfig b/configs/ast2600_openbmc_defconfig
> index de8fca770674..4565c2953460 100644
> --- a/configs/ast2600_openbmc_defconfig
> +++ b/configs/ast2600_openbmc_defconfig
> @@ -116,6 +116,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2400_defconfig b/configs/evb-ast2400_defconfig
> index f92dbfd668cd..46f9a9467929 100644
> --- a/configs/evb-ast2400_defconfig
> +++ b/configs/evb-ast2400_defconfig
> @@ -56,6 +56,7 @@ CONFIG_SPI_FLASH_SPANSION=y
>   CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2500-spl_defconfig b/configs/evb-ast2500-spl_defconfig
> index 0f6780b5e4e8..3467ae6cda2d 100644
> --- a/configs/evb-ast2500-spl_defconfig
> +++ b/configs/evb-ast2500-spl_defconfig
> @@ -70,6 +70,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
>   CONFIG_SPI_FLASH_SPANSION=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig
> index 91921cf76e62..d692a0811109 100644
> --- a/configs/evb-ast2500_defconfig
> +++ b/configs/evb-ast2500_defconfig
> @@ -57,6 +57,7 @@ CONFIG_SPI_FLASH_SPANSION=y
>   CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600-cot_defconfig b/configs/evb-ast2600-cot_defconfig
> index b656e528c855..06fc84b139a4 100644
> --- a/configs/evb-ast2600-cot_defconfig
> +++ b/configs/evb-ast2600-cot_defconfig
> @@ -105,6 +105,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig
> index 3e302e51ef2f..d0d867adb0e8 100644
> --- a/configs/evb-ast2600_defconfig
> +++ b/configs/evb-ast2600_defconfig
> @@ -75,6 +75,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a0-cot_defconfig b/configs/evb-ast2600a0-cot_defconfig
> index 1a377736ea4a..826e7b34e22a 100644
> --- a/configs/evb-ast2600a0-cot_defconfig
> +++ b/configs/evb-ast2600a0-cot_defconfig
> @@ -91,6 +91,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a0-spl_defconfig b/configs/evb-ast2600a0-spl_defconfig
> index 69548bcddeda..a88a14411f7b 100644
> --- a/configs/evb-ast2600a0-spl_defconfig
> +++ b/configs/evb-ast2600a0-spl_defconfig
> @@ -92,6 +92,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a0_defconfig b/configs/evb-ast2600a0_defconfig
> index 51cf6ac3ca35..358c31511297 100644
> --- a/configs/evb-ast2600a0_defconfig
> +++ b/configs/evb-ast2600a0_defconfig
> @@ -69,6 +69,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-cot_defconfig b/configs/evb-ast2600a1-cot_defconfig
> index b656e528c855..06fc84b139a4 100644
> --- a/configs/evb-ast2600a1-cot_defconfig
> +++ b/configs/evb-ast2600a1-cot_defconfig
> @@ -105,6 +105,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-ecc_defconfig b/configs/evb-ast2600a1-ecc_defconfig
> index c637bac65472..cda88addfa43 100644
> --- a/configs/evb-ast2600a1-ecc_defconfig
> +++ b/configs/evb-ast2600a1-ecc_defconfig
> @@ -70,6 +70,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-emmc-cot_defconfig b/configs/evb-ast2600a1-emmc-cot_defconfig
> index 68ac56cf170c..552bb6b104a3 100644
> --- a/configs/evb-ast2600a1-emmc-cot_defconfig
> +++ b/configs/evb-ast2600a1-emmc-cot_defconfig
> @@ -101,6 +101,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-emmc_defconfig b/configs/evb-ast2600a1-emmc_defconfig
> index ce3bd5e07dba..b7e4e9df9646 100644
> --- a/configs/evb-ast2600a1-emmc_defconfig
> +++ b/configs/evb-ast2600a1-emmc_defconfig
> @@ -102,6 +102,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-spl-ecc_defconfig b/configs/evb-ast2600a1-spl-ecc_defconfig
> index 245dee329eb7..530199913d28 100644
> --- a/configs/evb-ast2600a1-spl-ecc_defconfig
> +++ b/configs/evb-ast2600a1-spl-ecc_defconfig
> @@ -119,6 +119,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1-spl_defconfig b/configs/evb-ast2600a1-spl_defconfig
> index be6a1d8a2328..4be5b6c95b41 100644
> --- a/configs/evb-ast2600a1-spl_defconfig
> +++ b/configs/evb-ast2600a1-spl_defconfig
> @@ -119,6 +119,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
> diff --git a/configs/evb-ast2600a1_defconfig b/configs/evb-ast2600a1_defconfig
> index 68ff5547b789..c0db1d56db26 100644
> --- a/configs/evb-ast2600a1_defconfig
> +++ b/configs/evb-ast2600a1_defconfig
> @@ -73,6 +73,7 @@ CONFIG_SPI_FLASH_STMICRO=y
>   CONFIG_SPI_FLASH_WINBOND=y
>   CONFIG_PHY_BROADCOM=y
>   CONFIG_PHY_REALTEK=y
> +CONFIG_PHY_NCSI=y
>   CONFIG_DM_ETH=y
>   CONFIG_PHY_GIGE=y
>   CONFIG_FTGMAC100=y
Joel Stanley June 15, 2022, 5:58 a.m. UTC | #2 
On Fri, 10 Jun 2022 at 09:31, Cédric Le Goater <clg@kaod.org> wrote:
>
> On 6/10/22 10:00, Joel Stanley wrote:
> > Now that NCSI can be enabled without breaking non-NCSI systems, enable
> > it in all defconfigs.
> >
> > Signed-off-by: Joel Stanley <joel@jms.id.au>
>
> You should add :
>
> CONFIG_CMD_NCSI=y

Was this required, or just something that helps for testing?

Note that you can trigger the same code to run by using any network
command, such as 'dhcp', 'tftp' or 'ping'.

>
> C.
>
> > ---
> >   configs/ast2600-pfr_defconfig            | 1 +
> >   configs/ast2600_openbmc_defconfig        | 1 +
> >   configs/evb-ast2400_defconfig            | 1 +
> >   configs/evb-ast2500-spl_defconfig        | 1 +
> >   configs/evb-ast2500_defconfig            | 1 +
> >   configs/evb-ast2600-cot_defconfig        | 1 +
> >   configs/evb-ast2600_defconfig            | 1 +
> >   configs/evb-ast2600a0-cot_defconfig      | 1 +
> >   configs/evb-ast2600a0-spl_defconfig      | 1 +
> >   configs/evb-ast2600a0_defconfig          | 1 +
> >   configs/evb-ast2600a1-cot_defconfig      | 1 +
> >   configs/evb-ast2600a1-ecc_defconfig      | 1 +
> >   configs/evb-ast2600a1-emmc-cot_defconfig | 1 +
> >   configs/evb-ast2600a1-emmc_defconfig     | 1 +
> >   configs/evb-ast2600a1-spl-ecc_defconfig  | 1 +
> >   configs/evb-ast2600a1-spl_defconfig      | 1 +
> >   configs/evb-ast2600a1_defconfig          | 1 +
> >   17 files changed, 17 insertions(+)
> >
> > diff --git a/configs/ast2600-pfr_defconfig b/configs/ast2600-pfr_defconfig
> > index 398e55d0f3d4..dbe87e35a635 100644
> > --- a/configs/ast2600-pfr_defconfig
> > +++ b/configs/ast2600-pfr_defconfig
> > @@ -120,6 +120,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/ast2600_openbmc_defconfig b/configs/ast2600_openbmc_defconfig
> > index de8fca770674..4565c2953460 100644
> > --- a/configs/ast2600_openbmc_defconfig
> > +++ b/configs/ast2600_openbmc_defconfig
> > @@ -116,6 +116,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2400_defconfig b/configs/evb-ast2400_defconfig
> > index f92dbfd668cd..46f9a9467929 100644
> > --- a/configs/evb-ast2400_defconfig
> > +++ b/configs/evb-ast2400_defconfig
> > @@ -56,6 +56,7 @@ CONFIG_SPI_FLASH_SPANSION=y
> >   CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2500-spl_defconfig b/configs/evb-ast2500-spl_defconfig
> > index 0f6780b5e4e8..3467ae6cda2d 100644
> > --- a/configs/evb-ast2500-spl_defconfig
> > +++ b/configs/evb-ast2500-spl_defconfig
> > @@ -70,6 +70,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
> >   CONFIG_SPI_FLASH_SPANSION=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig
> > index 91921cf76e62..d692a0811109 100644
> > --- a/configs/evb-ast2500_defconfig
> > +++ b/configs/evb-ast2500_defconfig
> > @@ -57,6 +57,7 @@ CONFIG_SPI_FLASH_SPANSION=y
> >   CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600-cot_defconfig b/configs/evb-ast2600-cot_defconfig
> > index b656e528c855..06fc84b139a4 100644
> > --- a/configs/evb-ast2600-cot_defconfig
> > +++ b/configs/evb-ast2600-cot_defconfig
> > @@ -105,6 +105,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig
> > index 3e302e51ef2f..d0d867adb0e8 100644
> > --- a/configs/evb-ast2600_defconfig
> > +++ b/configs/evb-ast2600_defconfig
> > @@ -75,6 +75,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a0-cot_defconfig b/configs/evb-ast2600a0-cot_defconfig
> > index 1a377736ea4a..826e7b34e22a 100644
> > --- a/configs/evb-ast2600a0-cot_defconfig
> > +++ b/configs/evb-ast2600a0-cot_defconfig
> > @@ -91,6 +91,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a0-spl_defconfig b/configs/evb-ast2600a0-spl_defconfig
> > index 69548bcddeda..a88a14411f7b 100644
> > --- a/configs/evb-ast2600a0-spl_defconfig
> > +++ b/configs/evb-ast2600a0-spl_defconfig
> > @@ -92,6 +92,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a0_defconfig b/configs/evb-ast2600a0_defconfig
> > index 51cf6ac3ca35..358c31511297 100644
> > --- a/configs/evb-ast2600a0_defconfig
> > +++ b/configs/evb-ast2600a0_defconfig
> > @@ -69,6 +69,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-cot_defconfig b/configs/evb-ast2600a1-cot_defconfig
> > index b656e528c855..06fc84b139a4 100644
> > --- a/configs/evb-ast2600a1-cot_defconfig
> > +++ b/configs/evb-ast2600a1-cot_defconfig
> > @@ -105,6 +105,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-ecc_defconfig b/configs/evb-ast2600a1-ecc_defconfig
> > index c637bac65472..cda88addfa43 100644
> > --- a/configs/evb-ast2600a1-ecc_defconfig
> > +++ b/configs/evb-ast2600a1-ecc_defconfig
> > @@ -70,6 +70,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-emmc-cot_defconfig b/configs/evb-ast2600a1-emmc-cot_defconfig
> > index 68ac56cf170c..552bb6b104a3 100644
> > --- a/configs/evb-ast2600a1-emmc-cot_defconfig
> > +++ b/configs/evb-ast2600a1-emmc-cot_defconfig
> > @@ -101,6 +101,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-emmc_defconfig b/configs/evb-ast2600a1-emmc_defconfig
> > index ce3bd5e07dba..b7e4e9df9646 100644
> > --- a/configs/evb-ast2600a1-emmc_defconfig
> > +++ b/configs/evb-ast2600a1-emmc_defconfig
> > @@ -102,6 +102,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-spl-ecc_defconfig b/configs/evb-ast2600a1-spl-ecc_defconfig
> > index 245dee329eb7..530199913d28 100644
> > --- a/configs/evb-ast2600a1-spl-ecc_defconfig
> > +++ b/configs/evb-ast2600a1-spl-ecc_defconfig
> > @@ -119,6 +119,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1-spl_defconfig b/configs/evb-ast2600a1-spl_defconfig
> > index be6a1d8a2328..4be5b6c95b41 100644
> > --- a/configs/evb-ast2600a1-spl_defconfig
> > +++ b/configs/evb-ast2600a1-spl_defconfig
> > @@ -119,6 +119,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
> > diff --git a/configs/evb-ast2600a1_defconfig b/configs/evb-ast2600a1_defconfig
> > index 68ff5547b789..c0db1d56db26 100644
> > --- a/configs/evb-ast2600a1_defconfig
> > +++ b/configs/evb-ast2600a1_defconfig
> > @@ -73,6 +73,7 @@ CONFIG_SPI_FLASH_STMICRO=y
> >   CONFIG_SPI_FLASH_WINBOND=y
> >   CONFIG_PHY_BROADCOM=y
> >   CONFIG_PHY_REALTEK=y
> > +CONFIG_PHY_NCSI=y
> >   CONFIG_DM_ETH=y
> >   CONFIG_PHY_GIGE=y
> >   CONFIG_FTGMAC100=y
>
Cédric Le Goater June 15, 2022, 6 a.m. UTC | #3 
On 6/15/22 07:58, Joel Stanley wrote:
> On Fri, 10 Jun 2022 at 09:31, Cédric Le Goater <clg@kaod.org> wrote:
>>
>> On 6/10/22 10:00, Joel Stanley wrote:
>>> Now that NCSI can be enabled without breaking non-NCSI systems, enable
>>> it in all defconfigs.
>>>
>>> Signed-off-by: Joel Stanley <joel@jms.id.au>
>>
>> You should add :
>>
>> CONFIG_CMD_NCSI=y
> 
> Was this required, or just something that helps for testing?

It helped for 'ping' if I remember well. Without it, it didn't
work (on QEMU).

Thanks,

C.
Joel Stanley June 15, 2022, 6:33 a.m. UTC | #4 
On Wed, 15 Jun 2022 at 06:00, Cédric Le Goater <clg@kaod.org> wrote:
>
> On 6/15/22 07:58, Joel Stanley wrote:
> > On Fri, 10 Jun 2022 at 09:31, Cédric Le Goater <clg@kaod.org> wrote:
> >>
> >> On 6/10/22 10:00, Joel Stanley wrote:
> >>> Now that NCSI can be enabled without breaking non-NCSI systems, enable
> >>> it in all defconfigs.
> >>>
> >>> Signed-off-by: Joel Stanley <joel@jms.id.au>
> >>
> >> You should add :
> >>
> >> CONFIG_CMD_NCSI=y
> >
> > Was this required, or just something that helps for testing?
>
> It helped for 'ping' if I remember well. Without it, it didn't
> work (on QEMU).

I see why. In net/net.c:

#if defined(CONFIG_CMD_NCSI)
                case NCSI:
                        ncsi_probe_packages();
                        break;
#endif

If CMD_NCSI is not enabled we never get a chance to probe the packages
(unless a NCSI packet happens to be received).

I think we should do this, so it works without the command, but I'm
not sure if it's the correct fix:

--- a/net/net.c
+++ b/net/net.c
@@ -539,7 +539,7 @@ restart:
                        wol_start();
                        break;
 #endif
-#if defined(CONFIG_CMD_NCSI)
+#if defined(CONFIG_PHY_NCSI)
                case NCSI:
                        ncsi_probe_packages();


FWIW, the intent was that ncsi would work without the command:

https://lore.kernel.org/u-boot/6f2bd3960efd895eb2660fcf02053f14f8d6a386.camel@mendozajonas.com/


>
> Thanks,
>
> C.
diff mbox series

Patch

diff --git a/configs/ast2600-pfr_defconfig b/configs/ast2600-pfr_defconfig
index 398e55d0f3d4..dbe87e35a635 100644
--- a/configs/ast2600-pfr_defconfig
+++ b/configs/ast2600-pfr_defconfig
@@ -120,6 +120,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/ast2600_openbmc_defconfig b/configs/ast2600_openbmc_defconfig
index de8fca770674..4565c2953460 100644
--- a/configs/ast2600_openbmc_defconfig
+++ b/configs/ast2600_openbmc_defconfig
@@ -116,6 +116,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2400_defconfig b/configs/evb-ast2400_defconfig
index f92dbfd668cd..46f9a9467929 100644
--- a/configs/evb-ast2400_defconfig
+++ b/configs/evb-ast2400_defconfig
@@ -56,6 +56,7 @@  CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2500-spl_defconfig b/configs/evb-ast2500-spl_defconfig
index 0f6780b5e4e8..3467ae6cda2d 100644
--- a/configs/evb-ast2500-spl_defconfig
+++ b/configs/evb-ast2500-spl_defconfig
@@ -70,6 +70,7 @@  CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig
index 91921cf76e62..d692a0811109 100644
--- a/configs/evb-ast2500_defconfig
+++ b/configs/evb-ast2500_defconfig
@@ -57,6 +57,7 @@  CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600-cot_defconfig b/configs/evb-ast2600-cot_defconfig
index b656e528c855..06fc84b139a4 100644
--- a/configs/evb-ast2600-cot_defconfig
+++ b/configs/evb-ast2600-cot_defconfig
@@ -105,6 +105,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600_defconfig b/configs/evb-ast2600_defconfig
index 3e302e51ef2f..d0d867adb0e8 100644
--- a/configs/evb-ast2600_defconfig
+++ b/configs/evb-ast2600_defconfig
@@ -75,6 +75,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a0-cot_defconfig b/configs/evb-ast2600a0-cot_defconfig
index 1a377736ea4a..826e7b34e22a 100644
--- a/configs/evb-ast2600a0-cot_defconfig
+++ b/configs/evb-ast2600a0-cot_defconfig
@@ -91,6 +91,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a0-spl_defconfig b/configs/evb-ast2600a0-spl_defconfig
index 69548bcddeda..a88a14411f7b 100644
--- a/configs/evb-ast2600a0-spl_defconfig
+++ b/configs/evb-ast2600a0-spl_defconfig
@@ -92,6 +92,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a0_defconfig b/configs/evb-ast2600a0_defconfig
index 51cf6ac3ca35..358c31511297 100644
--- a/configs/evb-ast2600a0_defconfig
+++ b/configs/evb-ast2600a0_defconfig
@@ -69,6 +69,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-cot_defconfig b/configs/evb-ast2600a1-cot_defconfig
index b656e528c855..06fc84b139a4 100644
--- a/configs/evb-ast2600a1-cot_defconfig
+++ b/configs/evb-ast2600a1-cot_defconfig
@@ -105,6 +105,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-ecc_defconfig b/configs/evb-ast2600a1-ecc_defconfig
index c637bac65472..cda88addfa43 100644
--- a/configs/evb-ast2600a1-ecc_defconfig
+++ b/configs/evb-ast2600a1-ecc_defconfig
@@ -70,6 +70,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-emmc-cot_defconfig b/configs/evb-ast2600a1-emmc-cot_defconfig
index 68ac56cf170c..552bb6b104a3 100644
--- a/configs/evb-ast2600a1-emmc-cot_defconfig
+++ b/configs/evb-ast2600a1-emmc-cot_defconfig
@@ -101,6 +101,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-emmc_defconfig b/configs/evb-ast2600a1-emmc_defconfig
index ce3bd5e07dba..b7e4e9df9646 100644
--- a/configs/evb-ast2600a1-emmc_defconfig
+++ b/configs/evb-ast2600a1-emmc_defconfig
@@ -102,6 +102,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-spl-ecc_defconfig b/configs/evb-ast2600a1-spl-ecc_defconfig
index 245dee329eb7..530199913d28 100644
--- a/configs/evb-ast2600a1-spl-ecc_defconfig
+++ b/configs/evb-ast2600a1-spl-ecc_defconfig
@@ -119,6 +119,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1-spl_defconfig b/configs/evb-ast2600a1-spl_defconfig
index be6a1d8a2328..4be5b6c95b41 100644
--- a/configs/evb-ast2600a1-spl_defconfig
+++ b/configs/evb-ast2600a1-spl_defconfig
@@ -119,6 +119,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y
diff --git a/configs/evb-ast2600a1_defconfig b/configs/evb-ast2600a1_defconfig
index 68ff5547b789..c0db1d56db26 100644
--- a/configs/evb-ast2600a1_defconfig
+++ b/configs/evb-ast2600a1_defconfig
@@ -73,6 +73,7 @@  CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_BROADCOM=y
 CONFIG_PHY_REALTEK=y
+CONFIG_PHY_NCSI=y
 CONFIG_DM_ETH=y
 CONFIG_PHY_GIGE=y
 CONFIG_FTGMAC100=y