From mboxrd@z Thu Jan 1 00:00:00 1970 From: York Sun Date: Thu, 17 Oct 2013 10:40:01 -0700 Subject: [U-Boot] [PATCH 1/2][v2]powerpc/usb:Define CONFIG_USB_MAX_CONTROLLER_COUNT for all 85xx socs In-Reply-To: <52601B96.80607@freescale.com> References: <1381408958-5114-1-git-send-email-ramneek.mehresh@freescale.com> <52601B96.80607@freescale.com> Message-ID: <526020F1.6080001@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 >> --- >> 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 > #include > > -#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