| Message ID | 20201203032429.25005-1-judge.packham@gmail.com |
|---|---|
| State | Accepted |
| Commit | 0606bf2b7c0d941f84e76f1e8dd577313c72b587 |
| Delegated to: | Priyanka Jain |
| Headers | show |
| Series | powerpc: mpc85xx: Allow boards to override CONFIG_USB_MAX_CONTROLLER_COUNT | expand |
>-----Original Message----- >From: Chris Packham <judge.packham@gmail.com> >Sent: Thursday, December 3, 2020 8:54 AM >To: u-boot@lists.denx.de >Cc: Chris Packham <judge.packham@gmail.com>; Andy Fleming ><afleming@gmail.com>; Mario Six <mario.six@gdsys.cc>; Priyanka Jain ><priyanka.jain@nxp.com>; Stefan Roese <sr@denx.de>; Wolfgang Denk ><wd@denx.de>; Y.b. Lu <yangbo.lu@nxp.com> >Subject: [PATCH] powerpc: mpc85xx: Allow boards to override >CONFIG_USB_MAX_CONTROLLER_COUNT > >If the board isn't strapped to enable USB1 then attempting to access it will >result in a hang. Avoid this by allowing boards to define >CONFIG_USB_MAX_CONTROLLER_COUNT. > >Signed-off-by: Chris Packham <judge.packham@gmail.com> >--- <snip> Applied to fsl-qoriq. Awaiting upstream Regards Priyanka
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 4ca1e2b325f1..f25ba1af0928 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -116,7 +116,9 @@ #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 +#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#endif #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 #define CONFIG_SYS_FSL_TBCLK_DIV 32 #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2"
If the board isn't strapped to enable USB1 then attempting to access it will result in a hang. Avoid this by allowing boards to define CONFIG_USB_MAX_CONTROLLER_COUNT. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- arch/powerpc/include/asm/config_mpc85xx.h | 2 ++ 1 file changed, 2 insertions(+)