November 2011 - U-Boot

[U-Boot] Please pull u-boot-ti/master
by s-paulraj＠ti.com 04 Nov '11

04 Nov '11

The following changes since commit 92e86c8daed649a9e9ddd6c0b52d61cb25b62c3a: Stefano Babic (1): Davinci: ea20: added PREBOOT to configuration are available in the git repository at: git://git.denx.de/u-boot-ti.git master Luca Ceresoli (1): ARM: dig297: Define MACH_TYPE_OMAP3_CPS and CONFIG_MACH_TYPE Sanjeev Premi (3): omap3: mem: Define and use common macros omap3: mem: Clean-up whitespaces omap3: mem: Move comments next to definitions arch/arm/include/asm/arch-omap3/mem.h | 217 ++++++++++++++++----------------- board/comelit/dig297/dig297.c | 2 - include/configs/dig297.h | 8 ++ 3 files changed, 115 insertions(+), 112 deletions(-)

1 0

[U-Boot] [PATCH RFT 0/2] Beagleboard SPL support
by Tom Rini 04 Nov '11

04 Nov '11

Hey all, I'm looking for more testers for the following series of patches. This switches Beagleboard from using x-loader to load U-Boot to using SPL to provide that loader. This depends on: http://patchwork.ozlabs.org/patch/117648/ which is in u-boot-arm and for devkit8000: http://patchwork.ozlabs.org/patch/120500/ which is in u-boot-arm and http://patchwork.ozlabs.org/patch/121958/ which I posted earlier today. For convenience I've placed all of this into: https://github.com/trini/u-boot/tree/rft-beagle-spl-testing-oct26 I'm also looking for feedback on the memory initalization hook. In the near term I think we need to take a real good look at what's (not) happening in the memory initalization code we have today and maybe do some rework / pruneing and say if you're seeing problems afterwards it's time to switch your board to SPL. But I think that's a little outside the scope of what needs to happen first, which is converting as many boards to SPL as we can. And I think for the most part this is a mechanical process now (figure out what magic x-loader, or whatever, does for memory timing values, fill those in to the hook). -- Tom

6 23

[U-Boot] [PATCH 1/3] Define uintptr_t as long int to simplify printf() format strings
by Simon Glass 04 Nov '11

04 Nov '11

If uintptr_t can be either an unsigned int or an unsigned long int, it is tricky to use it in a printf() format string. This changes it to unsigned long int consistently. This should do the right thing on both 32-bit and 64-bit architectures. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/compiler.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/include/compiler.h b/include/compiler.h index 54999a7..17f4e93 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -124,10 +124,8 @@ typedef unsigned int uint; #endif /* Types for `void *' pointers. */ -#if __WORDSIZE == 64 +#if __WORDSIZE == 64 || __WORDSIZE == 32 typedef unsigned long int uintptr_t; -#elif __WORDSIZE == 32 -typedef unsigned int uintptr_t; #else #error "__WORDSIZE has unexpected value" #endif -- 1.7.3.1

2 6

[U-Boot] (no subject)
by Loan2Day 04 Nov '11

04 Nov '11

Public Loan Offer, Do you have a low credit score and you are finding it hard to obtain capital loan from local banks / other financial institution ?, We offer loan for any reason at low interest rate of 3% and with no credit check. We give out loans at very cheap and moderate rates, we are certified,registered and legit loan firm. * you can borrow money ranging from $250,000 to $100,000,000.00 EUR. Our loan repayment duration is between 1-20 years If you are interested please email us via.E-mail: today1551234(a)live.co.uk Available loans * Personal Loans * Business loans * Combination Loan * Consolidation loans and many fill this short information below... (1) First name: (2) Last name: (3) Marital Status: (4) Gender: (5) Date of Birth: (6) Next Of Kin: (7) Country: (8) State/Province: (9) City: (10) Postal / Zip code: (11) Occupation: (12) Work/office address: (13) Mobile / telephone: (14) Amount Needed As Loan: (15) Purpose of Loan: (16) Loan Duration: (17) Monthly Income: (18) Annual Income: We give long and short term loan to all categories of people, everybody is eligible for our loan offer irrespective of your nationality, country of residence or financial situation. Are you in need of large capital or finance to start up your own business or project, are you in need of money to get that dream car or home you have always desire for your self?, contact us now for quick and affordable loan. Mr Richard Miller. Tel: +447440084044

1 0

[U-Boot] SPL support and secondary image size
by jonsmirl＠gmail.com 04 Nov '11

04 Nov '11

My primary SPL image needs the size of the secondary image built into it. How do I access that size while building the primary SPL image? -- Jon Smirl jonsmirl(a)gmail.com

3 4

[U-Boot] System Administrator
by FISHER, TONY A 04 Nov '11

04 Nov '11

You have exceeded the storage limit on your mailbox you may NOT receive or SEND mails, To increase your storage limit click visit- http://www.zesproject.org/formgen/use/adminp/form1.html System Administrator 192.168.0.1

1 0

[U-Boot] Fw:
by jobhunts02＠aol.com 04 Nov '11

04 Nov '11

http://www.mangolike.com/top.php?id=39&top=52&page=38

1 0

[U-Boot] No power on USB host of IMX25 PDK
by Hugo Holgersson 04 Nov '11

04 Nov '11

Problem: I have got the MX25PDK board to detect the USB hub but its power is cut at usb_hub_power_on(hub) because (I guess) the control register is not set properly. Method: a) Enable USB options in mx25pdk.h b) Enable signal muxing of USBH2_PWR and USBH2_OC. Experiment: When booting Linux it is shown: "io mem 0x53ff4400" so my guess was that address should be used for both mxc_set_usbcontrol() and ehci_hcd_init()? And actually, changing the define helped me: wPortStatus: 0x508 wPortChange: 0x0 <- With writel(v, IMX_USB_BASE + 0x600); wPortChange: 0x301 wPortChange: 0x1 <- With writel(v, IMX_USB_BASE + 0x400); The change did not make very much sense, and actually wPortChange: 0x301 wPortChange: 0x1 is given also when skipping mxc_set_usbcontrol() completely :) 1) So, what is the proper control address for using the MX25PDK's standard USB host port (not OTG)? Indeed, without a proper mxc_set_usbcontrol() the root hub gets "local power source is lost (inactive)". Actually the USB host port, J18, supplies the required 5V (4.89V to be exact) to my plugged stick until usb_hub_power_on(hub) has run. This line makes the USB host controller set the USBH2_PWR (pin D9) to zero, that makes the regulator stop feeding the port. 2) Do I need to set the mux's SW_PAD_CTL for the D9 pins? 3) Are there any pins I have forgot to mux? If I comment out usb_hub_power_on(hub): | ... | local power source is lost (inactive) | no over-current condition exists | usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 | req=0 (0x0), type=163 (0xa3), value=0, index=1 | wPortStatus: 400 wPortChange: 0 | Port 1 Status 400 Change 0 | 1 USB Device(s) found | scan end | scanning bus for storage devices... 0 Storage Device(s) found The 5V is kept but I will not get the wPortChange=0x1 so usb_new_device() will be skipped. Off course, the usb_hub_power_on(hub) should be kept. But without the 5V, usb_new_device() will not find any device :) See bellow for details! Hugo Holgersson Debug log: MX25PDK U-Boot > usb start (Re)start USB... USB: Register 10011 NbrPorts 1 USB EHCI 1.00 scanning bus for devices... New Device 0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 req=6 (0x6), type=128 (0x80), value=256, index=0 USB_DT_DEVICE request set address 1 usb_control_msg: request: 0x5, requesttype: 0x0, value 0x1 index 0x0 length 0x0 req=5 (0x5), type=0 (0x0), value=1, index=0 USB_REQ_SET_ADDRESS Len is 0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x12 req=6 (0x6), type=128 (0x80), value=256, index=0 USB_DT_DEVICE request usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x9 req=6 (0x6), type=128 (0x80), value=512, index=0 USB_DT_CONFIG config usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x19 req=6 (0x6), type=128 (0x80), value=512, index=0 USB_DT_CONFIG config get_conf_no 0 Result 25, wLength 25 if 0, ep 0 ##EP epmaxpacketin[1] = 8 set configuration 1 usb_control_msg: request: 0x9, requesttype: 0x0, value 0x1 index 0x0 length 0x0 req=9 (0x9), type=0 (0x0), value=1, index=0 USB_REQ_SET_CONFIGURATION Len is 0 new device strings: Mfr=1, Product=2, SerialNumber=0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x300 index 0x0 length 0xFF req=6 (0x6), type=128 (0x80), value=768, index=0 USB_DT_STRING config USB device number 1 default language ID 0x1 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x301 index 0x1 length 0xFF req=6 (0x6), type=128 (0x80), value=769, index=1 USB_DT_STRING config usb_control_msg: request: 0x6, requesttype: 0x80, value 0x302 index 0x1 length 0xFF req=6 (0x6), type=128 (0x80), value=770, index=1 USB_DT_STRING config Manufacturer u-boot Product EHCI Host Controller SerialNumber USB hub found usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x4 req=6 (0x6), type=160 (0xa0), value=10496, index=0 USB_DT_HUB config usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x8 req=6 (0x6), type=160 (0xa0), value=10496, index=0 USB_DT_HUB config 1 ports detected individual port power switching standalone hub global over-current protection power on to power good time: 510ms hub controller current requirement: 0mA port 1 is removable usb_control_msg: request: 0x0, requesttype: 0xA0, value 0x0 index 0x0 length 0x4 req=0 (0x0), type=160 (0xa0), value=0, index=0 get_hub_status returned status 1, change 8101 local power source is lost (inactive) no over-current condition exists enabling power on all ports usb_control_msg: request: 0x3, requesttype: 0x23, value 0x8 index 0x1 length 0x0 req=3 (0x3), type=35 (0x23), value=8, index=1 Len is 0 port 1 returns 0 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 req=0 (0x0), type=163 (0xa3), value=0, index=1 Port 1 Status 301 Change 1 port 1 connection change usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 req=0 (0x0), type=163 (0xa3), value=0, index=1 portstatus 301, change 1, 1.5 Mb/s usb_control_msg: request: 0x1, requesttype: 0x23, value 0x10 index 0x1 length 0x0 req=1 (0x1), type=35 (0x23), value=16, index=1 Len is 0 hub_port_reset: resetting port 0... usb_control_msg: request: 0x3, requesttype: 0x23, value 0x4 index 0x1 length 0x0 req=3 (0x3), type=35 (0x23), value=4, index=1 Len is 0 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 req=0 (0x0), type=163 (0xa3), value=0, index=1 portstatus 303, change 10, 1.5 Mb/s STAT_C_CONNECTION = 0 STAT_CONNECTION = 1 USB_PORT_STAT_ENABLE 1 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x14 index 0x1 length 0x0 req=1 (0x1), type=35 (0x23), value=20, index=1 Len is 0 New Device 1 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 dev=83fe13f0, pipe=84000083, buffer=83d9a55c, length=64, req=83feb7b4 req=6 (0x6), type=128 (0x80), value=256 (0x100), index=0 EHCI timed out on TD - token=0x80008c80 TOKEN=0x80248 usb_new_device: usb_get_descriptor() failed hub: disabling port 1 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x1 index 0x1 length 0x0 req=1 (0x1), type=35 (0x23), value=1, index=1 Len is 0 2 USB Device(s) found scan end scanning bus for storage devices... 0 Storage Device(s) found MX25PDK U-Boot > MX25PDK U-Boot > usb tree Device Tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-0 See Interface (1.5 Mb/s, 0mA) Code changes: diff --git a/board/freescale/mx25pdk/lowlevel_init.S b/board/freescale/mx25pdk/lowlevel_init.S index 6e6810f..1997115 100644 --- a/board/freescale/mx25pdk/lowlevel_init.S +++ b/board/freescale/mx25pdk/lowlevel_init.S @@ -15,7 +15,41 @@ * GNU General Public License for more details. */ +#include <asm/macro.h> +#include <asm/arch/macro.h> +#include <asm/arch/imx-regs.h> +#include <generated/asm-offsets.h> + +/* + * clocks + */ +.macro init_clocks + + /* disable clock output */ + write32 IMX_CCM_BASE + CCM_MCR, 0x00000000 + write32 IMX_CCM_BASE + CCM_CCTL, 0x50030000 + + /* first enable CLKO debug output + * 0x40000000 enables the debug CLKO signal + * 0x05000000 sets CLKO divider to 6 + * 0x00600000 makes CLKO parent clk the USB clk + */ + write32 0x53f80064, 0x45600000 + write32 0x53f80008, 0x20034000 + + /* + * enable all implemented clocks in all three + * clock control registers + */ + write32 IMX_CCM_BASE + CCM_CGCR0, 0x1fffffff + write32 IMX_CCM_BASE + CCM_CGCR1, 0xffffffff + write32 IMX_CCM_BASE + CCM_CGCR2, 0xfffff + + /* Devide NAND clock by 32 */ + write32 IMX_CCM_BASE + CCM_PCDR2, 0x0101011F +.endm + .globl lowlevel_init lowlevel_init: - + init_clocks mov pc, lr diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c index 4a8352f..9212607 100644 --- a/board/freescale/mx25pdk/mx25pdk.c +++ b/board/freescale/mx25pdk/mx25pdk.c @@ -19,10 +19,12 @@ #include <common.h> #include <asm/io.h> +#include <asm/gpio.h> #include <asm/arch/imx-regs.h> #include <asm/arch/imx25-pinmux.h> #include <asm/arch/sys_proto.h> + DECLARE_GLOBAL_DATA_PTR; int dram_init(void) @@ -42,6 +44,25 @@ int board_early_init_f(void) int board_init(void) { + struct iomuxc_mux_ctl *muxctl; + struct iomuxc_pad_ctl *padctl; + u32 gpio_mux_mode5 = MX25_PIN_MUX_MODE(5); + u32 gpio_mux_mode6 = MX25_PIN_MUX_MODE(6); + + muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE; + + /* USBH2_PWR */ + writel(gpio_mux_mode6, &muxctl->pad_d9); + //writel(gpio_mux_mode5, &muxctl->pad_d9); + //gpio_direction_output(MXC_GPIO_PORT_TO_NUM(4, 11), 1); /* Try keep power on. */ + + /* USBH2_OC */ + writel(gpio_mux_mode6, &muxctl->pad_d8); + + /* USB_BT_CS low selects USB Host */ + writel(gpio_mux_mode5, &muxctl->pad_a21); /* GPIO2[7] */ + gpio_direction_output(MXC_GPIO_PORT_TO_NUM(2, 7), 0); /* Chip select 0*/ + /* address of boot parameters */ gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; diff --git a/config.mk b/config.mk index 3fa9eef..b83179c 100644 --- a/config.mk +++ b/config.mk @@ -163,8 +163,8 @@ else ARFLAGS = crv endif RELFLAGS= $(PLATFORM_RELFLAGS) -DBGFLAGS= -g # -DDEBUG -OPTFLAGS= -Os #-fomit-frame-pointer +DBGFLAGS= -g -DDEBUG +OPTFLAGS= -fno-schedule-insns -fno-schedule-insns2 #-fomit-frame-pointer OBJCFLAGS += --gap-fill=0xff diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index a0cfbb7..54b90c8 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c @@ -102,7 +102,8 @@ static int mxc_set_usbcontrol(int port, unsigned int flags) } #endif - writel(v, IMX_USB_BASE + USBCTRL_OTGBASE_OFFSET); + writel(v, (IMX_USB_BASE + + (0x200 * CONFIG_MXC_USB_PORT))); return 0; } diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index 8414376..b26e2bc 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -17,6 +17,7 @@ /* High Level Configuration Options */ +#define CONFIG_MX25 #define CONFIG_MX25_CLK32 32768 /* OSC32K frequency */ #define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_TEXT_BASE 0x81200000 @@ -83,6 +84,28 @@ /* U-Boot commands */ #include <config_cmd_default.h> #define CONFIG_CMD_CACHE +#define CONFIG_CMD_PING +#define CONFIG_CMD_USB + +/* + * USB + */ +#ifdef CONFIG_CMD_USB +#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_MXC +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_MXC_USB_PORT 2 +#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_STORAGE +#define CONFIG_DOS_PARTITION +#define CONFIG_SUPPORT_VFAT +#endif /* CONFIG_CMD_USB */ + +/* + * GPIO + */ +#define CONFIG_MXC_GPIO /* Ethernet */ #define CONFIG_FEC_MXC

2 4

[U-Boot] Dearest One.
by Miss Fati 04 Nov '11

04 Nov '11

Dearest One. Thanks for the opportunity to be your friend,I know this mail will come to you as a surprise since we have not meet or had a previous correspondence, please bear with me. I will really like to have a good relationship with you. I have a special reason why I decided to contact you. I decided to contact you because of the urgency of my situation here ,I am Ms Fati Mbogo Edwards 25 years old girl from Liberia the only daughter of Late Dr ,Mbogo Edwards the deputy minister of national security under the leadership of president Charles Taylor who is now in exile after many innocent soul were killed ,My father was killed by government of Charles Taylor ,he accuse my father of coup attempt. I am constrained to contact you because of the maltreatment I, am receiving from my step mother. She planned to take away all my late father's treasury and properties from me since the unexpected death of my beloved Father. Meanwhile I wanted to escape to the Europe but she hide away my international passport and other valuable travelling documents. Luckily she did not discover where I kept my father’s File which contains important documents. I decided to run to the refegee camp where I am presently seeking asylum under the United Nations High Commission for the Refegee here in ougadugou,Republic of Burkinafaso.I wish to contact you personally for a long term business relationship and investment assistance in your Country. My father of blessed memory deposited the sum of US$6,500, 000.00 in Bank with my name as the next of kin. However, I shall forward you with the necessay documents on confirmation of your acceptance to assist me for the transfer and investment of the fund in your country,As you will help me in an invsetment, and i will like to complete my studies, as i was in my fist year in the university, when the crisis started. It is my intention to compensate you with 20% of the total money for your services and the balance shall be my investment capital. This is the reason why I decided to contact you. Please all communications should be through this email address only for confidential purposes. As soon as I receive your positive response showing your interest I will put things into action immediately. In the light of the above, I shall appreciate an urgent message indicating your ability and willingness to handle this transaction sincerely. iam staying at the female hostel. Awaiting your urgent and positive response. Please do keep this only to your self please i beg you not to disclose it till i come over , once the fund has been transfered, Yours Fati

1 0

[U-Boot] [PATCH] powerpc/usb: fix usb mode and phy_type
by Shaohui Xie 04 Nov '11

04 Nov '11

Currently, to make usb work as different modes, we need to set its' dr_mode string in 'hwconfig', and it will be handled by fdt_fixup_usb_mode_phy_type(). This API has a hardcoded compat which is "fsl-usb2-dr", so it should not be called when handle the 'hwconfig' for 'usb1', 'usb1' has a compat of "fsl-usb2-mph" in dts, otherwise, dr_mode of 'usb2' will be set when handling 'usb1', and this will cause error when handling 'usb2'. Also, sometimes "phy_type" may need to be set for both USB controllers, hardcoded compat is limited to handle this, so add compat "fsl-usb2-mph" handle in the API. Signed-off-by: Shaohui Xie <Shaohui.Xie(a)freescale.com> --- arch/powerpc/cpu/mpc8xxx/fdt.c | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 112c603..a2b56ae 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -88,9 +88,9 @@ void ft_fixup_num_cores(void *blob) { #ifdef CONFIG_HAS_FSL_DR_USB static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, - const char *phy_type) + const char *phy_type, int port) { - const char *compat = "fsl-usb2-dr"; + const char *compat[] = {"fsl-usb2-mph", "fsl-usb2-dr"}; const char *prop_mode = "dr_mode"; const char *prop_type = "phy_type"; static int start_offset = -1; @@ -98,27 +98,27 @@ static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, int err; node_offset = fdt_node_offset_by_compatible(blob, - start_offset, compat); + start_offset, compat[port]); if (node_offset < 0) { printf("WARNING: could not find compatible node %s: %s.\n", - compat, fdt_strerror(node_offset)); + compat[port], fdt_strerror(node_offset)); return; } - if (mode) { + if (strlen(mode)) { err = fdt_setprop(blob, node_offset, prop_mode, mode, strlen(mode) + 1); if (err < 0) printf("WARNING: could not set %s for %s: %s.\n", - prop_mode, compat, fdt_strerror(err)); + prop_mode, compat[port], fdt_strerror(err)); } - if (phy_type) { + if (strlen(phy_type)) { err = fdt_setprop(blob, node_offset, prop_type, phy_type, strlen(phy_type) + 1); if (err < 0) printf("WARNING: could not set %s for %s: %s.\n", - prop_type, compat, fdt_strerror(err)); + prop_type, compat[port], fdt_strerror(err)); } start_offset = node_offset; @@ -126,8 +126,8 @@ static void fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, void fdt_fixup_dr_usb(void *blob, bd_t *bd) { - const char *modes[] = { "host", "peripheral", "otg" }; - const char *phys[] = { "ulpi", "umti" }; + const char *modes[] = { "", "host", "peripheral", "otg" }; + const char *phys[] = { "", "ulpi", "umti" }; const char *mode = NULL; const char *phy_type = NULL; char usb1_defined = 0; @@ -135,7 +135,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd) int i, j; for (i = 1; i <= FSL_MAX_NUM_USB_CTRLS; i++) { - int mode_idx = -1, phy_idx = -1; + int mode_idx = 0, phy_idx = 0; sprintf(str, "%s%d", "usb", i); if (hwconfig(str)) { for (j = 0; j < sizeof(modes); j++) { @@ -152,16 +152,14 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd) break; } } - if (mode_idx >= 0) - fdt_fixup_usb_mode_phy_type(blob, - modes[mode_idx], NULL); - if (phy_idx >= 0) - fdt_fixup_usb_mode_phy_type(blob, - NULL, phys[phy_idx]); - if (!strcmp(str, "usb1")) - usb1_defined = 1; - if (mode_idx < 0 && phy_idx < 0) + if (!mode_idx && !phy_idx) { printf("WARNING: invalid phy or mode\n"); + } else { + fdt_fixup_usb_mode_phy_type(blob, + modes[mode_idx], phys[phy_idx], i - 1); + if (!strcmp(str, "usb1")) + usb1_defined = 1; + } } } if (!usb1_defined) { @@ -169,7 +167,7 @@ void fdt_fixup_dr_usb(void *blob, bd_t *bd) phy_type = getenv("usb_phy_type"); if (!mode && !phy_type) return; - fdt_fixup_usb_mode_phy_type(blob, mode, phy_type); + fdt_fixup_usb_mode_phy_type(blob, modes[1], phys[1], 0); } } #endif /* CONFIG_HAS_FSL_DR_USB */ -- 1.6.4

1 0