August 2010 - U-Boot

[U-Boot] [PATCH] USB-CDC: add missing variable in ether.c
by Stefano Babic 12 Aug '10

12 Aug '10

qmult was not defined if OTG dualspeed is set. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- drivers/usb/gadget/ether.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index e0ebf75..313f15f 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -144,6 +144,8 @@ static inline int is_cdc(struct eth_dev *dev) #ifdef CONFIG_USB_GADGET_DUALSPEED #define DEVSPEED USB_SPEED_HIGH +static unsigned qmult = 5; + /* for dual-speed hardware, use deeper queues at highspeed */ #define qlen(gadget) \ (DEFAULT_QLEN*((gadget->speed == USB_SPEED_HIGH) ? qmult : 1)) -- 1.6.3.3

2 1

[U-Boot] [PATCH V8 0/5] Add disk support to orion5x and edminiv2
by Albert Aribaud 12 Aug '10

12 Aug '10

Patchset history: V1: Initial 4-patch set -- not cleanly submitted (does not appear on gmane for instance) and contained some unrelated changes. V2: Slimmed down to 3 patches and removed unrelated changes. V3: Back to 4 patches (cmd_ide improvement, driver addition, cmd_ide support for orion, edminiv2 support for sata); made initialization code reuseable as a block driver ; moved to C structures; commented some constants. V4: Reordered objects alphabetically in drivers/block/Makefile. Shortened mv_sata to mvsata. Removed volatile qualifier in mvsata port structure. Moved port pointer definition from SoC to board code. Removed unrelated changes. V5: Fixed typo in mvsata_ide driver (IMP, should have been IPM). V6: Fixed case in ide register struct. Fixed warning in deminiv2.c Put IDE configuration under condition. V7: Reworked the initialization logic to poll status register. Moved initialization from board code to driver code. Removed driver header file and moved its content to driver code. Moved CONFIG_IDE_PREINIT from SoC to board config file. V8: Separated V7's patch 2 in two independant patches. Fixed typo in struct names within ide_preinit(). The V8 patches have been run through checkpatch.pl --no-tree with no errors or warnings, and have been tested on an ED Mini V2. Albert Aribaud (5): ide: add configuration CONFIG_IDE_SWAP_IO ide: reorder object files alphabetically ide: add mvsata_ide driver cmd_ide: add support for orion5x edminiv2: add mvsata_ide and cmd_ide support arch/arm/include/asm/arch-orion5x/orion5x.h | 3 + arch/powerpc/include/asm/config.h | 3 + common/cmd_ide.c | 23 +++-- doc/README.PXA_CF | 8 ++ drivers/block/Makefile | 7 +- drivers/block/mvsata_ide.c | 140 +++++++++++++++++++++++++++ include/configs/ap325rxa.h | 1 + include/configs/edminiv2.h | 34 ++++++- include/configs/ms7720se.h | 1 + include/configs/r2dplus.h | 1 + include/configs/r7780mp.h | 1 + 11 files changed, 209 insertions(+), 13 deletions(-) create mode 100644 drivers/block/mvsata_ide.c

4 13

[U-Boot] Non standard CFI detection tweaks
by Rogan Dawes 12 Aug '10

12 Aug '10

Hi Stefan, I'm trying to add support for my D-Link DNS323 (Orion5x-based) to U-Boot, building on the efforts of Albert Aribaud. One place where I am struggling is with the detection of the flash chip. The flash part is a 8 MB Spansion S29GL064M90TFIR4, and the data sheet can be found at: http://www.spansion.com/Support/Datasheets/s29gl-m_00_b8_e.pdf It says: > This device enters the CFI Query mode when the system writes the CFI > Query command, 98h, to address 55h, any time the device is ready to > read array data. Testing this from the command line, however, shows that this is in fact NOT true. In fact, the write needs to occur at aah, not 55h. This may be influenced by the following paragraph from the manual: > Depending on the model number, the devices have an 8-bit wide data > bus only, 16-bit wide data bus only, or a 16-bit wide data bus that > can also function as an 8-bit wide data bus by using the BYTE# > input. And: > R4 = x8/x16 Looking at the debug logs from cfi_flash.c, I see the following output: fwc addr ff8000aa cmd 98 9898 16bit x 8 bit is= cmd 51(Q) addr ff800020 is= ffff 5151 These lines are the closest to doing what appears to be needed for this part, in that the address being written to is correct, the address being read from is correct, the expected result is correct. The only thing that is not correct is the command to enter QRY mode. For this particular chip, the command is: mw.w 0xff8000aa 9800 (rather than 9898) (FWIW mw.b 0xff8000aa 98 also works fine to enter QRY mode) Having done that, the QRY results are present at 0xff800020: md.b ff800020 20 ff800020: 51 51 52 52 59 59 02 02 00 00 40 40 00 00 00 00 QQRRYY....@@.... ff800030: 00 00 00 00 00 00 27 27 36 36 00 00 00 00 04 04 ......''66...... Do you have any suggestions on the best way to modify cfi_flash.c to detect this chip? Regards, Rogan Dawes

5 21

[U-Boot] [PATCH] USB-CDC: called handle_interrupts inside usb_eth_send
by Stefano Babic 12 Aug '10

12 Aug '10

The patch removes an endless loop in the usb_eth_send if the tx_complete is not called before going in the loop. The driver interrupt routine is called allowing the driver to check if the TX is completed. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- drivers/usb/gadget/ether.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 1481d76..9eb43d7 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1808,6 +1808,8 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le struct usb_request *req = NULL; struct eth_dev *dev = &l_ethdev; + unsigned long ts; + unsigned long timeout = USB_CONNECT_TIMEOUT; dprintf("%s:...\n",__func__); req = dev->tx_req; @@ -1837,9 +1839,15 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le if (!retval) dprintf("%s: packet queued\n",__func__); + ts = get_timer(0); + packet_sent=0; while(!packet_sent) { - packet_sent=0; + if (get_timer(ts) > timeout) { + printf ("timeout sending packets to usb ethernet\n"); + return -1; + } + usb_gadget_handle_interrupts(); } return 0; -- 1.6.3.3

2 4

[U-Boot] [PATCH] USB-CDC: correct wrong alignment in ether.c
by Stefano Babic 12 Aug '10

12 Aug '10

The buffer for the status request must be word aligned because it is accessed with 32 bit pointer in the eth_status_complete function. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- drivers/usb/gadget/ether.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 313f15f..9f9b093 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -684,7 +684,7 @@ static struct usb_gadget_strings stringtab = { /*============================================================================*/ static u8 control_req[USB_BUFSIZ]; -static u8 status_req[STATUS_BYTECOUNT]; +static u8 status_req[STATUS_BYTECOUNT * 16] __attribute__ ((aligned(32))); -- 1.6.3.3

2 2

[U-Boot] [PATCH CFI]: Fix printing & reading of 16-bit CFI device identifiers
by Philippe De Muyter 12 Aug '10

12 Aug '10

Fix reading and printing of CFI flashes 16-bit devices identifiers Nowadays CFI flashes have a 16-bit device identifier. U-boot still print them and read them as if they were only 8-bit wide. Fix that. Before: Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x1B After: Intel Extended command set, Manufacturer ID: 0x89, Device ID: 0x881B Signed-off-by: Philippe De Muyter <phdm(a)macqel.be> --- drivers/mtd/cfi_flash.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 013d4ad..8fb6c2e 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1142,8 +1142,10 @@ void flash_print_info (flash_info_t * info) printf ("Unknown (%d)", info->vendor); break; } - printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x%02X", - info->manufacturer_id, info->device_id); + printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x", + info->manufacturer_id); + printf (info->chipwidth == FLASH_CFI_16BIT ? "%04X" : "%02X", + info->device_id); if (info->device_id == 0x7E) { printf("%04X", info->device_id2); } @@ -1494,8 +1496,9 @@ static void cmdset_intel_read_jedec_ids(flash_info_t *info) udelay(1000); /* some flash are slow to respond */ info->manufacturer_id = flash_read_uchar (info, FLASH_OFFSET_MANUFACTURER_ID); - info->device_id = flash_read_uchar (info, - FLASH_OFFSET_DEVICE_ID); + info->device_id = (info->chipwidth == FLASH_CFI_16BIT) ? + flash_read_word (info, FLASH_OFFSET_DEVICE_ID) : + flash_read_uchar (info, FLASH_OFFSET_DEVICE_ID); flash_write_cmd(info, 0, 0, FLASH_CMD_RESET); } -- 1.6.3.3 -- Philippe De Muyter phdm at macqel dot be Tel +32 27029044 Macq Electronique SA rue de l'Aeronef 2 B-1140 Bruxelles Fax +32 27029077

2 1

[U-Boot] [PATCH] MTD: Cleanup jffs2/mtdpart headers
by Stefan Roese 12 Aug '10

12 Aug '10

This patch moves some MTD related defines and prototypes from a jffs2 header to an MTD header. This makes it possible to remove this jffs2 header inclusion from some files without jffs2 relevance. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Alexander Stein <alexander.stein(a)systec-electronic.com> --- board/sixnet/sixnet.c | 1 - common/cmd_flash.c | 11 +--------- common/cmd_jffs2.c | 2 +- common/cmd_nand.c | 10 --------- drivers/mtd/nand/nand_base.c | 4 --- include/jffs2/jffs2.h | 1 + include/jffs2/load_kernel.h | 43 ----------------------------------------- include/linux/mtd/mtd.h | 44 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 47 insertions(+), 69 deletions(-) diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index edb5d13..b30c01b 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -24,7 +24,6 @@ #include <common.h> #include <config.h> -#include <jffs2/jffs2.h> #include <mpc8xx.h> #include <net.h> /* for eth_init() */ #include <rtc.h> diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 3e6bab2..abb4a57 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -26,21 +26,12 @@ */ #include <common.h> #include <command.h> +#include <linux/mtd/mtd.h> #ifdef CONFIG_HAS_DATAFLASH #include <dataflash.h> #endif -#if defined(CONFIG_CMD_MTDPARTS) -#include <jffs2/jffs2.h> - -/* partition handling routines */ -int mtdparts_init(void); -int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num); -int find_dev_and_part(const char *id, struct mtd_device **dev, - u8 *part_num, struct part_info **part); -#endif - #ifndef CONFIG_SYS_NO_FLASH extern flash_info_t flash_info[]; /* info for FLASH chips */ diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c index 0e7a6b0..b599cc7 100644 --- a/common/cmd_jffs2.c +++ b/common/cmd_jffs2.c @@ -215,7 +215,7 @@ static int mtd_device_validate(u8 type, u8 num, u32 *size) * @param dev_num parsed device number (output) * @return 0 on success, 1 otherwise */ -static int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num) +int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num) { const char *p = id; diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 3f1d077..7e861f6 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -18,18 +18,8 @@ #include <watchdog.h> #include <malloc.h> #include <asm/byteorder.h> -#include <jffs2/jffs2.h> #include <nand.h> -#if defined(CONFIG_CMD_MTDPARTS) - -/* partition handling routines */ -int mtdparts_init(void); -int id_parse(const char *id, const char **ret_id, u8 *dev_type, u8 *dev_num); -int find_dev_and_part(const char *id, struct mtd_device **dev, - u8 *part_num, struct part_info **part); -#endif - static int nand_dump(nand_info_t *nand, ulong off, int only_oob) { int i; diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ed1c9c9..d60059c 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -75,10 +75,6 @@ #include <asm/io.h> #include <asm/errno.h> -#ifdef CONFIG_JFFS2_NAND -#include <jffs2/jffs2.h> -#endif - /* * CONFIG_SYS_NAND_RESET_CNT is used as a timeout mechanism when resetting * a flash. NAND flash is initialized prior to interrupts so standard timers diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index 651f94c..1a7b50e 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -39,6 +39,7 @@ #define __LINUX_JFFS2_H__ #include <asm/types.h> +#include <linux/mtd/mtd.h> #include <jffs2/load_kernel.h> #define JFFS2_SUPER_MAGIC 0x72b6 diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index 906eb3d..ccae2f1 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -25,43 +25,6 @@ * */ -#include <linux/list.h> - -/* mtd device types */ -#define MTD_DEV_TYPE_NOR 0x0001 -#define MTD_DEV_TYPE_NAND 0x0002 -#define MTD_DEV_TYPE_ONENAND 0x0004 - -#define MTD_DEV_TYPE(type) ((type == MTD_DEV_TYPE_NAND) ? "nand" : \ - (type == MTD_DEV_TYPE_ONENAND) ? "onenand" : "nor") - -struct mtd_device { - struct list_head link; - struct mtdids *id; /* parent mtd id entry */ - u16 num_parts; /* number of partitions on this device */ - struct list_head parts; /* partitions */ -}; - -struct part_info { - struct list_head link; - char *name; /* partition name */ - u8 auto_name; /* set to 1 for generated name */ - u32 size; /* total size of the partition */ - u32 offset; /* offset within device */ - void *jffs2_priv; /* used internaly by jffs2 */ - u32 mask_flags; /* kernel MTD mask flags */ - u32 sector_size; /* size of sector */ - struct mtd_device *dev; /* parent device */ -}; - -struct mtdids { - struct list_head link; - u8 type; /* device type */ - u8 num; /* device number */ - u32 size; /* device size */ - char *mtd_id; /* linux kernel device id */ -}; - #define ldr_strlen strlen #define ldr_strncmp strncmp #define ldr_memcpy memcpy @@ -74,10 +37,4 @@ struct mtdids { #define putLabeledWord(x, y) printf("%s %08x\n", x, (unsigned int)y) #define led_blink(x, y, z, a) -/* common/cmd_jffs2.c */ -extern int mtdparts_init(void); -extern int find_dev_and_part(const char *id, struct mtd_device **dev, - u8 *part_num, struct part_info **part); -extern struct mtd_device *device_find(u8 type, u8 num); - #endif /* load_kernel_h */ diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 16556c4..c65f18d 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -9,6 +9,7 @@ #include <linux/types.h> #include <div64.h> +#include <linux/list.h> #include <linux/mtd/mtd-abi.h> #define MTD_CHAR_MAJOR 90 @@ -23,6 +24,41 @@ #define MTD_FAIL_ADDR_UNKNOWN -1LL +/* U-Boot mtd device types */ +#define MTD_DEV_TYPE_NOR 0x0001 +#define MTD_DEV_TYPE_NAND 0x0002 +#define MTD_DEV_TYPE_ONENAND 0x0004 + +#define MTD_DEV_TYPE(type) ((type == MTD_DEV_TYPE_NAND) ? "nand" : \ + (type == MTD_DEV_TYPE_ONENAND) ? "onenand" : "nor") + +struct mtd_device { + struct list_head link; + struct mtdids *id; /* parent mtd id entry */ + u16 num_parts; /* number of partitions on this device */ + struct list_head parts; /* partitions */ +}; + +struct part_info { + struct list_head link; + char *name; /* partition name */ + u8 auto_name; /* set to 1 for generated name */ + u32 size; /* total size of the partition */ + u32 offset; /* offset within device */ + void *jffs2_priv; /* used internaly by jffs2 */ + u32 mask_flags; /* kernel MTD mask flags */ + u32 sector_size; /* size of sector */ + struct mtd_device *dev; /* parent device */ +}; + +struct mtdids { + struct list_head link; + u8 type; /* device type */ + u8 num; /* device number */ + u32 size; /* device size */ + char *mtd_id; /* linux kernel device id */ +}; + /* * Enumeration for NAND/OneNAND flash chip state */ @@ -260,6 +296,14 @@ extern struct mtd_info *get_mtd_device_nm(const char *name); extern void put_mtd_device(struct mtd_info *mtd); +/* U-Boot mtdparts stuff */ +extern int mtdparts_init(void); +extern int find_dev_and_part(const char *id, struct mtd_device **dev, + u8 *part_num, struct part_info **part); +extern struct mtd_device *device_find(u8 type, u8 num); +extern int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type, + u8 *dev_num); + /* XXX U-BOOT XXX */ #if 0 struct mtd_notifier { -- 1.7.2.1

2 1

[U-Boot] [PATCH] TI: DaVinci DA850 EVM: support passing device speed grade information to kernel
by Sekhar Nori 12 Aug '10

12 Aug '10

The TI DA850/OMAP-L138/AM18x EVM can be populated with devices of different speed grades. The maximum speed the chip can support can only be determined from the label on the package (not software readable). Introduce a method to pass the speed grade information to kernel using ATAG_REVISION. The kernel uses this information to determine the maximum speed reachable using cpufreq. Note that U-Boot itself does not set the CPU rate. The CPU speed is setup by a primary bootloader ("UBL"). The rate setup by UBL could be different from the maximum speed grade of the device. Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> --- Applies to latest of U-Boot mainline master board/davinci/da8xxevm/da850evm.c | 38 +++++++++++++++++++++++++++++++++++++ include/configs/da850evm.h | 1 + 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 959b2c6..6a6d4fb 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -70,6 +70,44 @@ static const struct lpsc_resource lpsc[] = { { DAVINCI_LPSC_GPIO }, }; +#ifndef CONFIG_DA850_EVM_MAX_SPEED +#define CONFIG_DA850_EVM_MAX_SPEED 300000 +#endif + +/* + * get_board_rev() - setup to pass kernel board revision information + * Returns: + * bit[0-3] Maximum speed supported by the DA850/OMAP-L138/AM18x part + * 0 - 300 MHz + * 1 - 372 MHz + * 2 - 408 MHz + * 3 - 456 MHz + */ +u32 get_board_rev(void) +{ + char *s; + u32 maxspeed = CONFIG_DA850_EVM_MAX_SPEED; + u32 rev = 0; + + s = getenv("maxspeed"); + if (s) + maxspeed = simple_strtoul(s, NULL, 10); + + switch (maxspeed) { + case 456000: + rev |= 3; + break; + case 408000: + rev |= 2; + break; + case 372000: + rev |= 1; + break; + } + + return rev; +} + int board_init(void) { #ifndef CONFIG_USE_IRQ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 357715d..3ea9032 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -102,6 +102,7 @@ */ #define LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_MEMTEST_START + 0x100) #define CONFIG_CMDLINE_TAG +#define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTARGS \ "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" -- 1.6.2.4

3 5

[U-Boot] I-Cache disabled for Cortex
by vipink 12 Aug '10

12 Aug '10

Hi All, In arch/arm/cpu/armv7/start.S, Icache is not enabled by default Is this intentional? I believe u-boot enables Icache by default for all CPUs. Regards Vipin

2 1

[U-Boot] Bug in mcf547x_8x/config.mk
by Groleo Marius 12 Aug '10

12 Aug '10

Hi, I'm not sure what is the purpose of the code below, found in u-boot-2010.06/arch/m68k/cpu/mcf547x_8x/config.mk 26 PLATFORM_RELFLAGS += -ffixed-d7 -msep-data 27 ifneq ($(findstring 4.1,$(shell $(CC) --version)),4.1) 28 PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC 29 else 30 PLATFORM_CPPFLAGS += -m5407 -fPIC 31 endif Either it filters out all 4.1.x gcc versions or all x.4.1. I tend to belive it's the first one. In this case, line 27 should be 27 ifneq ($(findstring 4.1.,$(shell $(CC) --version)),4.1.) Notice the extra dot. -- Regards! http://groleo.wordpress.com

1 1