[U-Boot] [PATCH 1/2][v2]powerpc/usb:Define CONFIG_USB_MAX_CONTROLLER_COUNT for all 85xx socs

[York Sun]

On 10/17/2013 10:17 AM, York Sun wrote:
> On 10/10/2013 05:42 AM, Ramneek Mehresh wrote:
>> CONFIG_USB_MAX_CONTROLLER_COUNT macro recently defined for
>> initializing all USB controllers on a given platform. This
>> macro is defined for all 85xx socs
>>
>> Signed-off-by: Ramneek Mehresh <ramneek.mehresh at freescale.com>
>> ---
>> Changes for v2: rebased on u-boot-mpc85xx-next
>>
>>  arch/powerpc/cpu/mpc8xxx/fdt.c            |  6 ++++--
>>  arch/powerpc/include/asm/config_mpc85xx.h | 26 +++++++++++++++++++++++++-
>>  2 files changed, 29 insertions(+), 3 deletions(-)
>>
> Applied to 85xx/next branch. Pending to merge to master.
> 

Oops. Found a problem before pushing it.

> diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c
b/arch/powerpc/cpu/mpc8xxx/fdt.c
> index eb7cbbc..ceab92f 100644
> --- a/arch/powerpc/cpu/mpc8xxx/fdt.c
> +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c
> @@ -15,7 +15,9 @@
>  #include <phy.h>
>  #include <hwconfig.h>
>
> -#define FSL_MAX_NUM_USB_CTRLS	2
> +#ifdef CONFIG_USB_MAX_CONTROLLER_COUNT
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT	1
> +#endif

Do you mean #ifndef here?

York