January 2013 - U-Boot

[U-Boot] [PATCH v3 1/4] usb: mxs: Disable USB Port 1 for i.MX23
by Otavio Salvador 28 Jan '13

28 Jan '13

The i.MX23 just one USB port so disable the second controller probe when building for i.MX23. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v3: None Changes in v2: None drivers/usb/host/ehci-mxs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 5062af5..28c8cde 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base = MXS_USBPHY0_BASE; break; +#ifdef CONFIG_MX28 case 1: usb_base = MXS_USBCTRL1_BASE; phy_base = MXS_USBPHY1_BASE; break; +#endif default: printf("CONFIG_EHCI_MXS_PORT (port = %d)\n", port); return -1; -- 1.8.1

1 3

[U-Boot] [PATCH v2 1/4] usb: mxs: Disable USB Port 1 for i.MX23
by Otavio Salvador 28 Jan '13

28 Jan '13

The i.MX23 just one USB port so disable the second controller probe when building for i.MX23. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v2: None drivers/usb/host/ehci-mxs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 5062af5..28c8cde 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base = MXS_USBPHY0_BASE; break; +#ifdef CONFIG_MX28 case 1: usb_base = MXS_USBCTRL1_BASE; phy_base = MXS_USBPHY1_BASE; break; +#endif default: printf("CONFIG_EHCI_MXS_PORT (port = %d)\n", port); return -1; -- 1.8.1

3 6

[U-Boot] [PATCH 1/4] usb: mxs: Disable USB Port 1 for i.MX23
by Otavio Salvador 28 Jan '13

28 Jan '13

The i.MX23 just one USB port so disable the second controller probe when building for i.MX23. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- drivers/usb/host/ehci-mxs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 5062af5..28c8cde 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -50,10 +50,12 @@ int mxs_ehci_get_port(struct ehci_mxs *mxs_usb, int port) usb_base = MXS_USBCTRL0_BASE; phy_base = MXS_USBPHY0_BASE; break; +#ifdef CONFIG_MX28 case 1: usb_base = MXS_USBCTRL1_BASE; phy_base = MXS_USBPHY1_BASE; break; +#endif default: printf("CONFIG_EHCI_MXS_PORT (port = %d)\n", port); return -1; -- 1.8.1

3 13

[U-Boot] [PATCH v4 1/3] led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
by Otavio Salvador 28 Jan '13

28 Jan '13

This fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v4: None Changes in v3: None Changes in v2: None common/cmd_led.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/cmd_led.c b/common/cmd_led.c index 7f5ab43..84f79fa 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (led_commands[i].on) led_commands[i].on(); else - __led_set(led_commands[i].mask, 1); + __led_set(led_commands[i].mask, + STATUS_LED_ON); break; case LED_OFF: if (led_commands[i].off) led_commands[i].off(); else - __led_set(led_commands[i].mask, 0); + __led_set(led_commands[i].mask, + STATUS_LED_OFF); break; case LED_TOGGLE: if (led_commands[i].toggle) -- 1.8.1

3 10

[U-Boot] [PATCH v5 1/3] led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
by Otavio Salvador 28 Jan '13

28 Jan '13

This fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None common/cmd_led.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/cmd_led.c b/common/cmd_led.c index 7f5ab43..84f79fa 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (led_commands[i].on) led_commands[i].on(); else - __led_set(led_commands[i].mask, 1); + __led_set(led_commands[i].mask, + STATUS_LED_ON); break; case LED_OFF: if (led_commands[i].off) led_commands[i].off(); else - __led_set(led_commands[i].mask, 0); + __led_set(led_commands[i].mask, + STATUS_LED_OFF); break; case LED_TOGGLE: if (led_commands[i].toggle) -- 1.8.1

1 2

Re: [U-Boot] [PATCH 1/1 v3] console: USB: KBD: Fix incorrect autoboot timeout
by Tom Rini 28 Jan '13

28 Jan '13

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 01/28/2013 11:30 AM, Tom Warren wrote: > Wolfgang, > >> -----Original Message----- From: Wolfgang Denk >> [mailto:wd@denx.de] Sent: Saturday, January 26, 2013 6:14 AM To: >> Marek Vasut Cc: Jim Lin; u-boot(a)lists.denx.de; Tom Warren; >> trini(a)ti.com; albert.u.boot(a)aribaud.net Subject: Re: [PATCH 1/1 >> v3] console: USB: KBD: Fix incorrect autoboot timeout >> >> Dear Marek Vasut, >> >> In message <201301260417.54768.marex(a)denx.de> you wrote: >>> >>>> Autoboot timeout defined by CONFIG_BOOTDELAY will not be >>>> accurate if CONFIG_USB_KEYBOARD and >>>> CONFIG_SYS_USB_EVENT_POLL are >> defined in >>>> configuration file and when tstc() function for checking key >>>> pressed takes longer time than 10 ms (e.g., 50 ms) to >>>> finish. >>>> >>>> Signed-off-by: Jim Lin <jilin(a)nvidia.com> >>> >>> Applied to u-boot-usb >> >> This is common code, and essentially unrelated to USB. It should >> go through Tom, not through the USB repo. > > Why do you expect this to go thru the Tegra tree? It's common code > - shouldn't it at least go thru my parent repo (ARM), if no > directly into u-boot.git/master? I think he means me :) - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJRBqk8AAoJENk4IS6UOR1WnqwQAI0Gpysj7oZjelcF7XDYVOPu /9rIsi3ZiB5+xtENWTBV08Y8GKpfNIdqMyMqQ3V6kWFSTAVzoNZDtoX3KX01Vvc8 SZ8LDlpQFzW1cCYxLcRdXIOmCXrUoc/qoJgbmYYHrnlZOHmSW1rrZTE2iW9QUe69 4YfmWDD5sVx/fGKXZvbzYu1Nt24qWtCXxGZ0jWBv3mPpvOtnyfePeUKdHhakn8PE eTI9MUXXsOCX4Sbj2anPKbmp+W4f6bKvl0OpBBQNHSuD5tYthuM/YTpmhwSnaGtr 8QiJNIc7nliSmQh4y0XrIqEaN3KC6oIN6VjO2uM5+TVern9HYIazy+uXXRvQvA5c wq+Xb2mxIZf4vet9BbAWIpNN7w5I6adnC1APM5I47IMQyxGfesi4cdt6JY/X4M+z xr9DZo4kcmszhAfSNH12MndQfutH6INcZeOpMFFZe+2h51XrbufUsT3mNwvsmcCT 6+Ef1VoMfpB0ZrCPxk969twm8sXarD2d6KW5uO/jDJF3ENoXIUEEbZpT8Sz/mlgJ 9bNyddsEptXS4mRoUszcWItc5Stok1fNYmECkknpPFOm01s7x6XUuRBpV72jFiwM +/d7K+wAH8jm9y0Ij2Ya3w8bKnilEAA3nJpbr5K9wPLEFqNrX++es/44lxQGb/vI OjPexZLYrEG9okXEC83v =cV3l -----END PGP SIGNATURE-----

1 0

Re: [U-Boot] [PATCH 1/1 v3] console: USB: KBD: Fix incorrect autoboot timeout
by Marek Vasut 28 Jan '13

28 Jan '13

Dear Tom Warren, > Wolfgang, > > > -----Original Message----- > > From: Wolfgang Denk [mailto:wd@denx.de] > > Sent: Saturday, January 26, 2013 6:14 AM > > To: Marek Vasut > > Cc: Jim Lin; u-boot(a)lists.denx.de; Tom Warren; trini(a)ti.com; > > albert.u.boot(a)aribaud.net > > Subject: Re: [PATCH 1/1 v3] console: USB: KBD: Fix incorrect autoboot > > timeout > > > > Dear Marek Vasut, > > > > In message <201301260417.54768.marex(a)denx.de> you wrote: > > > > Autoboot timeout defined by CONFIG_BOOTDELAY will not be accurate if > > > > CONFIG_USB_KEYBOARD and CONFIG_SYS_USB_EVENT_POLL are > > > > defined in > > > > > > configuration file and when tstc() function for checking key pressed > > > > takes longer time than 10 ms (e.g., 50 ms) to finish. > > > > > > > > Signed-off-by: Jim Lin <jilin(a)nvidia.com> > > > > > > Applied to u-boot-usb > > > > This is common code, and essentially unrelated to USB. It should go > > through Tom, not through the USB repo. > > Why do you expect this to go thru the Tegra tree? Tom Rini ... you're not the only Tom around here :p [...] Best regards, Marek Vasut

1 0

[U-Boot] [PATCH v2 0/7] Move Tegra EHCI drive to correct place
by Lucas Stach 28 Jan '13

28 Jan '13

This moves out the Tegra EHCI driver from a platform specific directory to the standard driver/usb/host dir. This is a preparation needed to share this driver between Tegra20 and Tegra30. No functional change in here, so Tegra30 is still not working. Patch 6 could be a lot smaller if it were generated with -B, as GIT would detect that most of it is moving stuff over, but last time I did this it prevented git apply to work. So sorry for the big diff. I think I incorporated all changes needed to reflect the review feedback I got on this last time. I expect this series to go in through the Tegra tree. Lucas Stach (7): tegra: usb: set USB_PORTS_MAX to correct value tegra: usb: make controller init functions more self contained tegra: usb: remove unneeded function parameter tegra: usb: move controller init into start_port tegra: usb: various small cleanups tegra: usb: move implementation into right directory tegra: usb: move [start|stop]_port into ehci_hcd_[init|stop] arch/arm/cpu/armv7/tegra20/Makefile | 1 - arch/arm/cpu/armv7/tegra20/usb.c | 567 --------------------- .../include/asm/{arch-tegra20 => arch-tegra}/usb.h | 22 - arch/arm/include/asm/arch-tegra20/tegra.h | 1 - arch/arm/include/asm/arch-tegra30/tegra.h | 2 + board/nvidia/common/board.c | 2 +- drivers/usb/host/ehci-tegra.c | 546 +++++++++++++++++++- 7 files changed, 533 insertions(+), 608 deletions(-) delete mode 100644 arch/arm/cpu/armv7/tegra20/usb.c rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/usb.h (89%) -- 1.8.0.2

5 20

[U-Boot] [PATCH v3 1/2] led: Use STATUS_LED_ON and STATUS_LED_OFF when calling __led_set
by Otavio Salvador 28 Jan '13

28 Jan '13

This fixes the gpio_led driver which needs to compare againt a STATUS_LED_ON to enable a led. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v3: None Changes in v2: None common/cmd_led.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/cmd_led.c b/common/cmd_led.c index 7f5ab43..84f79fa 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -110,13 +110,15 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (led_commands[i].on) led_commands[i].on(); else - __led_set(led_commands[i].mask, 1); + __led_set(led_commands[i].mask, + STATUS_LED_ON); break; case LED_OFF: if (led_commands[i].off) led_commands[i].off(); else - __led_set(led_commands[i].mask, 0); + __led_set(led_commands[i].mask, + STATUS_LED_OFF); break; case LED_TOGGLE: if (led_commands[i].toggle) -- 1.8.1

2 6

[U-Boot] [PATCH v6 1/2] mx23_olinuxino: Add default environment
by Otavio Salvador 28 Jan '13

28 Jan '13

This adds a default environment with support for MMC booting. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v6: - Remove 'saveenv' command as it is not need - Move environment settings to environment section Changes in v5: - Remove duplicate environment setting - Improve commit log Changes in v4: None Changes in v3: None Changes in v2: None include/configs/mx23_olinuxino.h | 77 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 7 deletions(-) diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index bc63481..4658aea 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -127,21 +127,84 @@ #define CONFIG_APBH_DMA /* - * ENV -- nowhere so far - */ -#define CONFIG_ENV_SIZE (16 * 1024) -#define CONFIG_ENV_IS_NOWHERE - -/* * Boot Linux */ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTFILE "uImage" -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_OF_LIBFDT +/* + * Environment + */ +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OVERWRITE +#ifdef CONFIG_ENV_IS_IN_MMC +#define CONFIG_ENV_OFFSET (256 * 1024) +#define CONFIG_ENV_SIZE (16 * 1024) +#define CONFIG_SYS_MMC_ENV_DEV 0 +#endif + +/* + * Extra Environments + */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "update_sd_firmware_filename=u-boot.sd\0" \ + "update_sd_firmware=" /* Update the SD firmware partition */ \ + "if mmc rescan ; then " \ + "if tftp ${update_sd_firmware_filename} ; then " \ + "setexpr fw_sz ${filesize} / 0x200 ; " /* SD block size */ \ + "setexpr fw_sz ${fw_sz} + 1 ; " \ + "mmc write ${loadaddr} 0x800 ${fw_sz} ; " \ + "fi ; " \ + "fi\0" \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ + "console=ttyAMA0\0" \ + "fdt_file=imx23-olinuxino.dtb\0" \ + "fdt_addr=0x41000000\0" \ + "boot_fdt=try\0" \ + "mmcdev=0\0" \ + "mmcpart=2\0" \ + "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else " \ + "echo ERR: Fail to boot from MMC; " \ + "fi; " \ + "fi; " \ + "else exit; fi" + #endif /* __MX23_OLINUXINO_CONFIG_H__ */ -- 1.8.1

4 9