February 2012 - U-Boot

[U-Boot] [PATCHv5 1/7] mkenvimage: correct and clarify comments and error messages
by David Wagner 27 Mar '12

27 Mar '12

Also, don't split error messages over several lines as per a coding style exception making them easier to grep. Signed-off-by: David Wagner <david.wagner(a)free-electrons.com> --- tools/mkenvimage.c | 41 +++++++++++++++-------------------------- 1 files changed, 15 insertions(+), 26 deletions(-) diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index f781731..c95f7f5 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -45,12 +45,9 @@ static void usage(const char *exec_name) { - fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] " - "-s <environment partition size> -o <output> <input file>\n" + fprintf(stderr, "%s [-h] [-r] [-b] [-p <byte>] -s <environment partition size> -o <output> <input file>\n" "\n" - "This tool takes a key=value input file (same as would a " - "`printenv' show) and generates the corresponding environment " - "image, ready to be flashed.\n" + "This tool takes a key=value input file (same as would a `printenv' show) and generates the corresponding environment image, ready to be flashed.\n" "\n" "\tThe input file is in format:\n" "\t\tkey1=value1\n" @@ -58,8 +55,7 @@ static void usage(const char *exec_name) "\t\t...\n" "\t-r : the environment has multiple copies in flash\n" "\t-b : the target is big endian (default is little endian)\n" - "\t-p <byte> : fill the image with <byte> bytes instead of " - "0xff bytes\n" + "\t-p <byte> : fill the image with <byte> bytes instead of 0xff bytes\n" "\t-V : print version information and exit\n" "\n" "If the input file is \"-\", data is read from standard input\n", @@ -100,8 +96,7 @@ int main(int argc, char **argv) case 'o': bin_filename = strdup(optarg); if (!bin_filename) { - fprintf(stderr, "Can't strdup() the output " - "filename\n"); + fprintf(stderr, "Can't strdup() the output filename\n"); return EXIT_FAILURE; } break; @@ -118,7 +113,7 @@ int main(int argc, char **argv) usage(prg); return EXIT_SUCCESS; case 'V': - printf("%s version %s\n", prg, PLAIN_VERSION); + printf("%s version %s\n", argv[0], PLAIN_VERSION); return EXIT_SUCCESS; case ':': fprintf(stderr, "Missing argument for option -%c\n", @@ -134,22 +129,21 @@ int main(int argc, char **argv) /* Check datasize and allocate the data */ if (datasize == 0) { - fprintf(stderr, - "Please specify the size of the environment " - "partition.\n"); + fprintf(stderr, "Please specify the size of the environment partition.\n"); usage(prg); return EXIT_FAILURE; } dataptr = malloc(datasize * sizeof(*dataptr)); if (!dataptr) { - fprintf(stderr, "Can't alloc dataptr.\n"); + fprintf(stderr, "Can't alloc %d bytes for dataptr.\n", + datasize); return EXIT_FAILURE; } /* * envptr points to the beginning of the actual environment (after the - * crc and possible `redundant' bit + * crc and possible `redundant' byte */ envsize = datasize - (CRC_SIZE + redundant); envptr = dataptr + CRC_SIZE + redundant; @@ -185,8 +179,8 @@ int main(int argc, char **argv) /* ... and check it */ ret = fstat(txt_fd, &txt_file_stat); if (ret == -1) { - fprintf(stderr, "Can't stat() on \"%s\": " - "%s\n", txt_filename, strerror(errno)); + fprintf(stderr, "Can't stat() on \"%s\": %s\n", + txt_filename, strerror(errno)); return EXIT_FAILURE; } @@ -200,13 +194,9 @@ int main(int argc, char **argv) } ret = close(txt_fd); } - /* - * The right test to do is "=>" (not ">") because of the additional - * ending \0. See below. - */ - if (filesize >= envsize) { - fprintf(stderr, "The input file is larger than the " - "environment partition size\n"); + /* The +1 is for the additionnal ending \0. See below. */ + if (filesize + 1 > envsize) { + fprintf(stderr, "The input file is larger than the environment partition size\n"); return EXIT_FAILURE; } @@ -255,8 +245,7 @@ int main(int argc, char **argv) * check the env size again to make sure we have room for two \0 */ if (ep >= envsize) { - fprintf(stderr, "The environment file is too large for " - "the target environment storage\n"); + fprintf(stderr, "The environment file is too large for the target environment storage\n"); return EXIT_FAILURE; } envptr[ep] = '\0'; -- 1.7.5.4

3 23

[U-Boot] [PATCH] microblaze: Enable phylib and mii support
by Stephan Linz 27 Mar '12

27 Mar '12

Enable phylib and mii support for AXI EMAC ethernet drivers on Microblaze systems. Signed-off-by: Stephan Linz <linz(a)li-pro.net> Reported-by: Michal Simek <monstr(a)monstr.eu> --- include/configs/microblaze-generic.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 03a6f5a..b76bbcf 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -338,4 +338,25 @@ #define CONFIG_FIT 1 #define CONFIG_OF_LIBFDT 1 +#if defined(CONFIG_XILINX_AXIEMAC) +# define CONFIG_MII 1 +# define CONFIG_CMD_MII 1 +# define CONFIG_PHY_GIGE 1 +# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN 1 +# define CONFIG_PHYLIB 1 +# define CONFIG_PHY_ATHEROS 1 +# define CONFIG_PHY_BROADCOM 1 +# define CONFIG_PHY_DAVICOM 1 +# define CONFIG_PHY_LXT 1 +# define CONFIG_PHY_MARVELL 1 +# define CONFIG_PHY_MICREL 1 +# define CONFIG_PHY_NATSEMI 1 +# define CONFIG_PHY_REALTEK 1 +# define CONFIG_PHY_VITESSE 1 +#else +# undef CONFIG_MII +# undef CONFIG_CMD_MII +# undef CONFIG_PHYLIB +#endif + #endif /* __CONFIG_H */ -- 1.7.0.4

2 1

[U-Boot] Patch: Fix device enumeration through API.
by Tim Kientzle 27 Mar '12

27 Mar '12

The one-line patch below fixes device enumeration through the U-Boot API. Device enumeration crashes when the system in question doesn't have any RAM mapped to address zero (I discovered this on a BeagleBone board), since the enumeration calls get_dev with a NULL ifname sometimes which then gets passed down to strncmp(). This fix simply ensures that get_dev returns NULL when invoked with a NULL ifname. This could also be fixed by reworking the device enumeration to never call get_dev with a NULL argument, but that's a much more extensive change. (get_dev is called from several places and the code is driven by a list that's constructed in a way that naturally leaves lots of NULLs.) Cheers, Tim Kientzle diff --git a/disk/part.c b/disk/part.c index f07a17f..1a82539 100644 --- a/disk/part.c +++ b/disk/part.c @@ -84,7 +84,7 @@ block_dev_desc_t *get_dev(char* ifname, int dev) #ifdef CONFIG_NEEDS_MANUAL_RELOC name += gd->reloc_off; #endif - while (drvr->name) { + while (ifname && drvr->name) { name = drvr->name; reloc_get_dev = drvr->get_dev; #ifdef CONFIG_NEEDS_MANUAL_RELOC

3 4

[U-Boot] u-boot usb-ethernet patch
by Mehmet Fatih Özay 27 Mar '12

27 Mar '12

Hello all We are using OMAP 3530 board and SMSC9512 usb-ethernet adapter. The main goal is to connect this adapter through USB OTG port and initialize at u-boot. In order to do it, we are using your u-boot patches for usb-ethernet SMSC95xx ( we patch your patch file to our u-boot-release (version u-boot 2009.11-svn12). What we succeed so far is introducing SMSC9512 to the system.As you can see from debugging below, we couldnot succeed to configure SMSC9512 and so we couldnot make ethernet work. By the way, USB OTG is connected to the OMAP through TPS6593. OMAP3 SBC3530 # usb start do usb (Re)start USB... USB: scanning bus for devices... New Device 0 usb_control_msg: devnum: 0x0, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 set address 1 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x5, requesttype: 0x0, value 0x1 index 0x0 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x12 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x9 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x19 get_conf_no 0 Result 25, wLength 25 if 0, ep 0 ##EP epmaxpacketin[1] = 1 set configuration 1 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x9, requesttype: 0x0, value 0x1 index 0x0 length 0x0 new device strings: Mfr=0, Product=0, SerialNumber=0 Manufacturer Product SerialNumber usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x9 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA0, value 0x0 index 0x0 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x3, requesttype: 0x23, value 0x8 index 0x1 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x3, requesttype: 0x23, value 0x8 index 0x2 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x3, requesttype: 0x23, value 0x8 index 0x3 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x10 index 0x1 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x3, requesttype: 0x23, value 0x4 index 0x1 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x14 index 0x1 length 0x0 New Device 1 usb_control_msg: devnum: 0x0, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x3, requesttype: 0x23, value 0x4 index 0x1 length 0x0 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x14 index 0x1 length 0x0 set address 2 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x5, requesttype: 0x0, value 0x2 index 0x0 length 0x0 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x12 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x9 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x27 get_conf_no 0 Result 39, wLength 39 if 0, ep 0 if 0, ep 1 if 0, ep 2 ##EP epmaxpacketin[1] = 64 ##EP epmaxpacketout[2] = 64 ##EP epmaxpacketin[3] = 16 set configuration 1 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x9, requesttype: 0x0, value 0x1 index 0x0 length 0x0 new device strings: Mfr=1, Product=2, SerialNumber=3 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x300 index 0x0 length 0xFF USB device number 2 default language ID 0x409 usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x301 index 0x409 length 0xFF usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x302 index 0x409 length 0xFF usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x303 index 0x409 length 0xFF Manufacturer Modeo Product LAN9512 SerialNumber 00951101 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x2 length 0x4 usb_control_msg: devnum: 0x1, configno: 0x0, irq_act_len 0x0 maxchild 0x3 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x3 length 0x4 2 USB Device(s) found scanning bus for ethernet devices... i=0 smsc95xx probe vend, product:424 9512 i=1 smsc95xx probe vend, product:424 EC00 USB Ethernet device detected Endpoints In 1 Out 2 Int 3 smsc95xx get info i=2 1 Ethernet Device(s) found OMAP3 SBC3530 # ping 192.168.2.1 ** smsc95xx_halt() ** smsc95xx_init() usb_control_msg: devnum: 0x2, configno: 0x0, irq_act_len 0x0 maxchild 0x0 usb_control_msg: request: 0xA0, requesttype: 0x40, value 0x0 index 0x14 length 0x4 len:-1 sizeof(data):4 Failed to write HW_CFG_LRST_ bit in HW_CFG register, ret = -1 ** smsc95xx_halt() ping failed; host 192.168.2.1 is not alive -- Mehmet Fatih Özay Yaz?l?m Gelis,tirme / Software Development C Tech Bil. Tek. San ve Tic. A.S,. (C2Tech) TUBITAK TEKSEB C-210 Gebze, Kocaeli, Turkey Tel: +90 262 644 90 48 Fax: +90 262 644 90 47 http://www.ctech.com.tr

3 2

[U-Boot] [PATCH] MAKEALL: display SPL size if present
by Scott Wood 26 Mar '12

26 Mar '12

This makes it easier to detect changes in the SPL portion, as can currently be done for the main U-Boot image. Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- MAKEALL | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/MAKEALL b/MAKEALL index f735af6..395e982 100755 --- a/MAKEALL +++ b/MAKEALL @@ -508,6 +508,11 @@ build_target() { ${CROSS_COMPILE}size ${BUILD_DIR}/u-boot \ | tee -a ${LOG_DIR}/$target.MAKELOG + + if [ -e ${BUILD_DIR}/spl/u-boot-spl ]; then + ${CROSS_COMPILE}size ${BUILD_DIR}/spl/u-boot-spl \ + | tee -a ${LOG_DIR}/$target.MAKELOG + fi } build_targets() { for t in "$@" ; do -- 1.7.7.rc3.4.g8d714

4 4

[U-Boot] [PATCH resend] ARMV7/Vexpress: add missing get_ticks() and get_tbclk()
by walimis 26 Mar '12

26 Mar '12

From: Liming Wang <walimisdev(a)gmail.com> commit f31a911fe (arm, post: add missing post_time_ms for arm) enables get_ticks and get_tbclk for all arm based boards, arm/vexpress also needs these functions to work. Signed-off-by: Liming Wang <walimisdev(a)gmail.com> --- board/armltd/vexpress/ca9x4_ct_vxp.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c index da6f14d..0b36d12 100644 --- a/board/armltd/vexpress/ca9x4_ct_vxp.c +++ b/board/armltd/vexpress/ca9x4_ct_vxp.c @@ -226,3 +226,13 @@ void lowlevel_init(void) ulong get_board_rev(void){ return readl((u32 *)SYS_ID); } + +unsigned long long get_ticks(void) +{ + return get_timer(0); +} + +ulong get_tbclk (void) +{ + return (ulong)CONFIG_SYS_HZ; +} -- 1.7.0.4

3 2

[U-Boot] [PATCH] Avoid using GNU basename
by Keith Mok 26 Mar '12

26 Mar '12

There is no GNU basename support in MacOS. Use generic POSIX basename defined in libgen.h instead. Signed-off-by: Keith Mok <ek9852(a)gmail.com> --- tools/mkenvimage.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/mkenvimage.c b/tools/mkenvimage.c index f781731..8b49723 100644 --- a/tools/mkenvimage.c +++ b/tools/mkenvimage.c @@ -25,9 +25,6 @@ * MA 02111-1307 USA */ -/* We want the GNU version of basename() */ -#define _GNU_SOURCE - #include <errno.h> #include <fcntl.h> #include <stdio.h> @@ -35,6 +32,7 @@ #include <string.h> #include <unistd.h> #include <compiler.h> +#include <libgen.h> #include <sys/types.h> #include <sys/stat.h> @@ -85,8 +83,10 @@ int main(int argc, char **argv) int fp, ep; const char *prg; + char *prog_pathname; - prg = basename(argv[0]); + prog_pathname = strdup(argv[0]); + prg = basename(prog_pathname); /* Turn off getopt()'s internal error message */ opterr = 0; -- 1.7.7.4

4 7

[U-Boot] [PATCH] Enable high speed support for USB device framework and usbtty
by Amit Virdi 26 Mar '12

26 Mar '12

From: Vipin KUMAR <vipin.kumar(a)st.com> This patch adds the support for high speed in usb device framework and usbtty driver. This feature has been kept within a macro CONFIG_USBD_HS, so the board configuration files have to define this macro to enable high speed support. Along with that specific peripheral drivers also need to define a function to let the framework know that the enumeration has happened at high speed. This function prototype is "int is_usbd_high_speed(void)" Signed-off-by: Vipin Kumar <vipin.kumar(a)st.com> Signed-off-by: Amit Virdi <amit.virdi(a)st.com> --- README | 8 +++++++ drivers/serial/usbtty.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- drivers/serial/usbtty.h | 4 +++ drivers/usb/gadget/core.c | 14 ++++++++++++ drivers/usb/gadget/ep0.c | 24 ++++++++++++++++++--- include/usbdescriptors.h | 15 +++++++++++++ include/usbdevice.h | 24 ++++++++++++++++++++- 7 files changed, 133 insertions(+), 6 deletions(-) diff --git a/README b/README index eba6378..d54bb68 100644 --- a/README +++ b/README @@ -1165,6 +1165,14 @@ The following options need to be configured: Define this to have a tty type of device available to talk to the UDC device + CONFIG_USBD_HS + Define this to enable the high speed support for usb + device and usbtty. If this feature is enabled, a routine + int is_usbd_high_speed(void) + also needs to be defined by the driver to dynamically poll + whether the enumeration has succeded at high speed or full + speed. + CONFIG_SYS_CONSOLE_IS_IN_ENV Define this if you want stdin, stdout &/or stderr to be set to usbtty. diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 550bc58..0374c7d 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -133,6 +133,19 @@ static struct usb_device_descriptor device_descriptor = { }; +#if defined(CONFIG_USBD_HS) +static struct usb_qualifier_descriptor qualifier_descriptor = { + .bLength = sizeof(struct usb_qualifier_descriptor), + .bDescriptorType = USB_DT_QUAL, + .bcdUSB = cpu_to_le16(USB_BCD_VERSION), + .bDeviceClass = COMMUNICATIONS_DEVICE_CLASS, + .bDeviceSubClass = 0x00, + .bDeviceProtocol = 0x00, + .bMaxPacketSize0 = EP0_MAX_PACKET_SIZE, + .bNumConfigurations = NUM_CONFIGS +}; +#endif + /* * Static CDC ACM specific descriptors */ @@ -638,6 +651,9 @@ static void usbtty_init_instances (void) memset (device_instance, 0, sizeof (struct usb_device_instance)); device_instance->device_state = STATE_INIT; device_instance->device_descriptor = &device_descriptor; +#if defined(CONFIG_USBD_HS) + device_instance->qualifier_descriptor = &qualifier_descriptor; +#endif device_instance->event = usbtty_event_handler; device_instance->cdc_recv_setup = usbtty_cdc_setup; device_instance->bus = bus_instance; @@ -751,6 +767,10 @@ static void usbtty_init_terminal_type(short type) device_descriptor.idProduct = cpu_to_le16(CONFIG_USBD_PRODUCTID_CDCACM); +#if defined(CONFIG_USBD_HS) + qualifier_descriptor.bDeviceClass = + COMMUNICATIONS_DEVICE_CLASS; +#endif /* Assign endpoint indices */ tx_endpoint = ACM_TX_ENDPOINT; rx_endpoint = ACM_RX_ENDPOINT; @@ -779,7 +799,9 @@ static void usbtty_init_terminal_type(short type) device_descriptor.bDeviceClass = 0xFF; device_descriptor.idProduct = cpu_to_le16(CONFIG_USBD_PRODUCTID_GSERIAL); - +#if defined(CONFIG_USBD_HS) + qualifier_descriptor.bDeviceClass = 0xFF; +#endif /* Assign endpoint indices */ tx_endpoint = GSERIAL_TX_ENDPOINT; rx_endpoint = GSERIAL_RX_ENDPOINT; @@ -932,6 +954,9 @@ static int usbtty_configured (void) static void usbtty_event_handler (struct usb_device_instance *device, usb_device_event_t event, int data) { +#if defined(CONFIG_USBD_HS) + int i; +#endif switch (event) { case DEVICE_RESET: case DEVICE_BUS_INACTIVE: @@ -942,6 +967,29 @@ static void usbtty_event_handler (struct usb_device_instance *device, break; case DEVICE_ADDRESS_ASSIGNED: +#if defined(CONFIG_USBD_HS) + /* + * is_usbd_high_speed routine needs to be defined by + * specific gadget driver + * It returns TRUE if device enumerates at High speed + * Retuns FALSE otherwise + */ + for (i = 1; i <= NUM_ENDPOINTS; i++) { + if (((ep_descriptor_ptrs[i - 1]->bmAttributes & + USB_ENDPOINT_XFERTYPE_MASK) == + USB_ENDPOINT_XFER_BULK) + && is_usbd_high_speed()) { + + ep_descriptor_ptrs[i - 1]->wMaxPacketSize = + CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE; + } + + endpoint_instance[i].tx_packetSize = + ep_descriptor_ptrs[i - 1]->wMaxPacketSize; + endpoint_instance[i].rcv_packetSize = + ep_descriptor_ptrs[i - 1]->wMaxPacketSize; + } +#endif usbtty_init_endpoints (); default: diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h index 6731c38..bd3bcbc 100644 --- a/drivers/serial/usbtty.h +++ b/drivers/serial/usbtty.h @@ -72,6 +72,10 @@ #define CONFIG_USBD_SERIAL_INT_PKTSIZE UDC_INT_PACKET_SIZE #define CONFIG_USBD_SERIAL_BULK_PKTSIZE UDC_BULK_PACKET_SIZE +#if defined(CONFIG_USBD_HS) +#define CONFIG_USBD_SERIAL_BULK_HS_PKTSIZE UDC_BULK_HS_PACKET_SIZE +#endif + #define USBTTY_DEVICE_CLASS COMMUNICATIONS_DEVICE_CLASS #define USBTTY_BCD_DEVICE 0x00 diff --git a/drivers/usb/gadget/core.c b/drivers/usb/gadget/core.c index 4f2ebab..b2212b4 100644 --- a/drivers/usb/gadget/core.c +++ b/drivers/usb/gadget/core.c @@ -212,6 +212,20 @@ struct usb_device_descriptor *usbd_device_device_descriptor (struct usb_device_i return (device->device_descriptor); } +#if defined(CONFIG_USBD_HS) +/** + * usbd_device_qualifier_descriptor + * @device: which device + * @port: which port + * + * Return the specified qualifier descriptor for the specified device. + */ +struct usb_qualifier_descriptor *usbd_device_qualifier_descriptor( + struct usb_device_instance *device, int port) +{ + return device->qualifier_descriptor; +} +#endif /** * usbd_device_configuration_descriptor diff --git a/drivers/usb/gadget/ep0.c b/drivers/usb/gadget/ep0.c index 22499d3..ba8f906 100644 --- a/drivers/usb/gadget/ep0.c +++ b/drivers/usb/gadget/ep0.c @@ -338,12 +338,28 @@ static int ep0_get_descriptor (struct usb_device_instance *device, } break; case USB_DESCRIPTOR_TYPE_DEVICE_QUALIFIER: +#if defined(CONFIG_USBD_HS) { - /* If a USB device supports both a full speed and low speed operation - * we must send a Device_Qualifier descriptor here - */ - return -1; + struct usb_qualifier_descriptor *qualifier_descriptor; + + qualifier_descriptor = usbd_device_qualifier_descriptor + (device, port); + if (!qualifier_descriptor) + return -1; + + /* copy descriptor for this device */ + copy_config(urb, qualifier_descriptor, + sizeof(struct usb_qualifier_descriptor), + max); + } + dbg_ep0(3, "copied qualifier descriptor, actual_length: 0x%x", + urb->actual_length); +#else + return -1; +#endif + break; + default: return -1; } diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h index 2dec3b9..de1069f 100644 --- a/include/usbdescriptors.h +++ b/include/usbdescriptors.h @@ -241,6 +241,21 @@ struct usb_device_descriptor { u8 bNumConfigurations; } __attribute__ ((packed)); +#if defined(CONFIG_USBD_HS) +struct usb_qualifier_descriptor { + u8 bLength; + u8 bDescriptorType; + + u16 bcdUSB; + u8 bDeviceClass; + u8 bDeviceSubClass; + u8 bDeviceProtocol; + u8 bMaxPacketSize0; + u8 bNumConfigurations; + u8 breserved; +} __attribute__ ((packed)); +#endif + struct usb_string_descriptor { u8 bLength; u8 bDescriptorType; /* 0x03 */ diff --git a/include/usbdevice.h b/include/usbdevice.h index 9eb8849..e3eb748 100644 --- a/include/usbdevice.h +++ b/include/usbdevice.h @@ -210,6 +210,10 @@ struct usb_bus_instance; #define USB_DT_INTERFACE 0x04 #define USB_DT_ENDPOINT 0x05 +#if defined(CONFIG_USBD_HS) +#define USB_DT_QUAL 0x06 +#endif + #define USB_DT_HID (USB_TYPE_CLASS | 0x01) #define USB_DT_REPORT (USB_TYPE_CLASS | 0x02) #define USB_DT_PHYSICAL (USB_TYPE_CLASS | 0x03) @@ -291,7 +295,11 @@ struct usb_bus_instance; * USB Spec Release number */ +#if defined(CONFIG_USBD_HS) +#define USB_BCD_VERSION 0x0200 +#else #define USB_BCD_VERSION 0x0110 +#endif /* @@ -567,6 +575,9 @@ struct usb_device_instance { /* generic */ char *name; struct usb_device_descriptor *device_descriptor; /* per device descriptor */ +#if defined(CONFIG_USBD_HS) + struct usb_qualifier_descriptor *qualifier_descriptor; +#endif void (*event) (struct usb_device_instance *device, usb_device_event_t event, int data); @@ -659,8 +670,19 @@ struct usb_class_report_descriptor *usbd_device_class_report_descriptor_index( s struct usb_endpoint_descriptor *usbd_device_endpoint_descriptor (struct usb_device_instance *, int, int, int, int, int); int usbd_device_endpoint_transfersize (struct usb_device_instance *, int, int, int, int, int); struct usb_string_descriptor *usbd_get_string (u8); -struct usb_device_descriptor *usbd_device_device_descriptor (struct usb_device_instance *, int); +struct usb_device_descriptor *usbd_device_device_descriptor(struct + usb_device_instance *, int); +#if defined(CONFIG_USBD_HS) +struct usb_qualifier_descriptor *usbd_device_qualifier_descriptor( + struct usb_device_instance *, int); +/* + * is_usbd_high_speed routine needs to be defined by specific gadget driver + * It returns TRUE if device enumerates at High speed + * Retuns FALSE otherwise + */ +int is_usbd_high_speed(void); +#endif int usbd_endpoint_halted (struct usb_device_instance *device, int endpoint); void usbd_rcv_complete(struct usb_endpoint_instance *endpoint, int len, int urb_bad); void usbd_tx_complete (struct usb_endpoint_instance *endpoint); -- 1.7.2.2

4 10

[U-Boot] [BUG] cfi_flash can't work correctly on latest uboot
by Bob Liu 21 Mar '12

21 Mar '12

Hi, folks I think this patch make cfi_flash can't work correctly. http://git.denx.de/?p=u-boot.git;a=commitdiff;h=df4e813b72bf07d9026b00455f5… --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1426,6 +1426,11 @@ int flash_real_protect (flash_info_t * info, long sector, int prot) #endif }; + /* + * Flash needs to be in status register read mode for + * flash_full_status_check() to work correctly + */ + flash_write_cmd(info, sector, 0, FLASH_CMD_READ_STATUS); -------------------------------------- without this line, flash can't be recognized. So it's correct here. U-Boot 2011.09-svn2735 (ADI-2012R1-pre) (Nov 02 2011 - 15:05:23) CPU: ADSP bf526-0.0 (Detected Rev: 0.2) (parallel flash boot) Board: ADI BF526 EZ-Board board Support: http://blackfin.uclinux.org/ Clock: VCO: 400 MHz, Core: 400 MHz, System: 80 MHz RAM: 64 MiB Flash: Flash protect timeout at address 20004000 data 1520ff01 Flash protect error at address 20004000 Vpp Low Error. 4 MiB Flash protect timeout at address 20000000 data 1520ff01 Flash protect error at address 20000000 Flash protect timeout at address 20002000 data 1520ff01 Flash protect error at address 20002000 Block locked. Vpp Low Error. Flash protect timeout at address 20004000 data 1520ff01 Flash protect error at address 20004000 Vpp Low Error. Flash protect timeout at address 20006000 data 1520ff01 Flash protect error at address 20006000 Flash protect timeout at address 20008000 data 1520ff01 Flash protect error at address 20008000 Block locked. Vpp Low Error. Flash protect timeout at address 2000a000 data 1520ff01 Flash protect error at address 2000a000 Block locked. Vpp Low Error. Flash protect timeout at address 2000c000 data 1520ff01 Flash protect error at address 2000c000 Vpp Low Error. Flash protect timeout at address 2000e000 data 1520ff01 Flash protect error at address 2000e000 Block Erase Error. -------------------------------------- if ((retcode = flash_full_status_check (info, sector, info->erase_blk_tout, prot ? "protect" : "unprotect")) == 0) { @@ -1975,6 +1980,13 @@ ulong flash_get_size (phys_addr_t base, int banknum) case CFI_CMDSET_INTEL_PROG_REGIONS: case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_STANDARD: + /* + * Set flash to read-id mode. Otherwise + * reading protected status is not + * guaranteed. + */ + flash_write_cmd(info, sect_cnt, 0, + FLASH_CMD_READ_ID); ---------------------------------------------------------------------------- But with this two lines. flash ops are not correct. I used old uboot version to read out data from flash. Then tftpboot and run with latest uboot version, you can see that the read out data from flash is different. And without set flash to read-id mode here, it works fine. U-Boot 2010.06 (ADI-2010R1-RC2) (Oct 20 2010 - 04:37:34) CPU: ADSP bf526-0.0 (Detected Rev: 0.2) (parallel flash boot) Board: ADI BF526 EZ-Board board Support: http://blackfin.uclinux.org/ Clock: VCO: 400 MHz, Core: 400 MHz, System: 80 MHz RAM: 64 MiB Flash: 4 MiB In: serial Out: serial Err: serial KGDB: [on serial] ready Net: bfin_mac Hit any key to stop autoboot: 0 bfin> bfin> md 0x20100000 20100000: 56190527 0b223987 d60baf4e 2e871c00 '..V.9".N....... 20100010: 00100000 c42c1c00 a86adb94 01021005 ......,...j..... 20100020: 32356662 2e302d36 2e332d30 2d382e30 bf526-0.0-3.0.8- 20100030: 2d494441 31313032 702d3152 732d6572 ADI-2011R1-pre-s 20100040: 00088b1f 00000000 fdc40302 4514780b .............x.E 20100050: 570e38d6 3d33264f 24f48743 0649d303 .8.WO&3=C..$..I. 20100060: 93080932 834e9970 0931141a 648443a0 2...p.N...1..C.d 20100070: e0804212 12048762 56501a34 086bb2f1 .B..b...4.PV..k. 20100080: 66e0888a d9782808 d165049d 75049945 ...f.(x...e.E..u 20100090: 31415041 ba02cba2 aebbb2ae 8093d34b APA1........K... 201000a0: 682f1a8a 9cffceb8 105ceeea 7f7df77d ../h......\.}.}. 201000b0: 3c7cf3df 3aea984f 9d554ea7 4e753aaa ..|<O..:.NU..:uN 201000c0: b1a94e5d b13ae91e cc436dbe 749b42c2 ]N....:..mC..B.t 201000d0: fa449283 2aa2ec29 a82e0846 b7089ae5 ..D.)..*F....... 201000e0: cc1f9dc4 a9920651 113e5122 b1122213 ....Q..."Q>..".. 201000f0: 308f15a9 b6496a6a 12562598 49a8c8af ...0jjI..%V....I bfin> tftpboot 0x1000 u-boot.bin Using bfin_mac device TFTP from server 10.100.4.174; our IP address is 10.100.4.50 Filename 'u-boot.bin'. Load address: 0x1000 Loading: ############### done Bytes transferred = 213828 (34344 hex) bfin> go 0x1000 ## Starting application at 0x00001000 ... U-Boot 2011.09-svn2735 (ADI-2012R1-pre) (Nov 02 2011 - 15:15:05) CPU: ADSP bf526-0.0 (Detected Rev: 0.2) (parallel flash boot) Board: ADI BF526 EZ-Board board Support: http://blackfin.uclinux.org/ Clock: VCO: 400 MHz, Core: 400 MHz, System: 80 MHz RAM: 64 MiB Flash: 4 MiB In: serial Out: serial Err: serial KGDB: [on serial] ready Net: bfin_mac Hit any key to stop autoboot: 0 bfin> md 0x20100000 20100000: 88150020 ffff0001 bfcfffff ffffffff ............... 20100010: ffffffff ffffffff ffffffff ffffffff ................ 20100020: 00520051 00030059 00390000 00000000 Q.R.Y.....9..... 20100030: 00000000 00170000 00850020 00040095 ........ ....... 20100040: 000a0000 00030000 00020000 00160000 ................ 20100050: 00000001 00000000 00070002 00200000 .............. . 20100060: 003e0000 00000000 ffff0001 ffffffff ..>............. 20100070: 0050ffff 00490052 00330031 000300e6 ..P.R.I.1.3..... 20100080: 00000000 00030001 00180000 00010090 ................ 20100090: 00000080 00040003 00040003 00020001 ................ 201000a0: 00070003 00010002 00110000 00000000 ................ 201000b0: 00070002 00200000 00640000 00010000 ...... ...d..... 201000c0: 00060003 00000000 00640001 00010000 ..........d..... 201000d0: 00070003 00110000 00000000 00070001 ................ 201000e0: 00000000 00640001 00010000 ffff0003 ......d......... 201000f0: ffffffff ffffffff ffffffff ffffffff ................ bfin> flinfo Bank # 1: CFI conformant flash (16 x 16) Size: 4 MB in 71 Sectors Intel Standard command set, Manufacturer ID: 0x20, Device ID: 0x8815 Erase timeout: 4096 ms, write timeout: 1 ms Sector Start Addresses: 20000000 RO 20002000 RO 20004000 RO 20006000 RO 20008000 RO 2000A000 RO 2000C000 RO 2000E000 RO 20010000 RO 20020000 RO 20030000 RO 20040000 RO 20050000 RO 20060000 RO 20070000 RO 20080000 RO 20090000 RO 200A0000 RO 200B0000 RO 200C0000 RO 200D0000 RO 200E0000 RO 200F0000 RO 20100000 RO 20110000 RO 20120000 RO 20130000 RO 20140000 RO 20150000 RO 20160000 RO 20170000 RO 20180000 RO 20190000 RO 201A0000 RO 201B0000 RO 201C0000 RO 201D0000 RO 201E0000 RO 201F0000 RO 20200000 RO 20210000 RO 20220000 RO 20230000 RO 20240000 RO 20250000 RO 20260000 RO 20270000 RO 20280000 RO 20290000 RO 202A0000 RO 202B0000 RO 202C0000 RO 202D0000 RO 202E0000 RO 202F0000 RO 20300000 RO 20310000 RO 20320000 RO 20330000 RO 20340000 RO 20350000 RO 20360000 RO 20370000 RO 20380000 RO 20390000 RO 203A0000 RO 203B0000 RO 203C0000 RO 203D0000 RO 203E0000 RO 203F0000 RO bfin> ---------------------------------------------------------------------------- info->protect[sect_cnt] = flash_isset (info, sect_cnt, FLASH_OFFSET_PROTECT, -- Regards, --Bob

2 1

[U-Boot] Bug in cfb_console driver
by Pali Rohár 21 Mar '12

21 Mar '12

Hello, commit 03d31fcf4c37d90a00e66f06b38742960139f090 break video framebuffer output on Nokia N900. After this commit is video output garbaged and not readable on display. Problem is in function video_invertchar() - when I commented it, video output is OK, but without cursor. Problem is only on real N900 device, not in qemu. -- Pali Rohár pali.rohar(a)gmail.com

2 7