March 2012 - U-Boot

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 30 Mar '12

30 Mar '12

The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2012-03-23 21:59:16 +0100) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to f9da0f894328802cb8aaeb8a24660e37ff624d26: Enable high speed support for USB device framework and usbtty (2012-03-28 16:31:08 +0200) ---------------------------------------------------------------- Vipin KUMAR (1): Enable high speed support for USB device framework and usbtty README | 8 +++++++ drivers/serial/usbtty.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- drivers/serial/usbtty.h | 4 +++ drivers/usb/gadget/core.c | 1 - drivers/usb/gadget/ep0.c | 23 +++++++++++++++++--- include/usbdescriptors.h | 15 +++++++++++++ include/usbdevice.h | 22 ++++++++++++++++++- 7 files changed, 116 insertions(+), 7 deletions(-)

2 1

[U-Boot] [PATCH] RAMDISK: Fix unused variable issue caused by raw rd support
by Marek Vasut 30 Mar '12

30 Mar '12

image.c: In function ‘boot_get_ramdisk’: image.c:800:8: warning: unused variable ‘end’ [-Wunused-variable] Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- common/image.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/common/image.c b/common/image.c index 103e0e6..342b315 100644 --- a/common/image.c +++ b/common/image.c @@ -797,7 +797,9 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, ulong rd_addr, rd_load; ulong rd_data, rd_len; const image_header_t *rd_hdr; +#ifdef CONFIG_SUPPORT_RAW_INITRD char *end; +#endif #if defined(CONFIG_FIT) void *fit_hdr; const char *fit_uname_config = NULL; -- 1.7.9.1

2 1

[U-Boot] [PATCH] RAMDISK: Fix unused variable issue caused by raw rd support
by Marek Vasut 30 Mar '12

30 Mar '12

image.c: In function ‘boot_get_ramdisk’: image.c:800:8: warning: unused variable ‘end’ [-Wunused-variable] Signed-off-by: Marek Vasut <marex(a)denx.de> --- common/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/image.c b/common/image.c index 103e0e6..d55d448 100644 --- a/common/image.c +++ b/common/image.c @@ -797,7 +797,6 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, ulong rd_addr, rd_load; ulong rd_data, rd_len; const image_header_t *rd_hdr; - char *end; #if defined(CONFIG_FIT) void *fit_hdr; const char *fit_uname_config = NULL; @@ -996,6 +995,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, #endif default: #ifdef CONFIG_SUPPORT_RAW_INITRD + char *end; if (argc >= 3 && (end = strchr(argv[2], ':'))) { rd_len = simple_strtoul(++end, NULL, 16); rd_data = rd_addr; -- 1.7.9.1

2 1

[U-Boot] zImage and raw ramdisk support -- test
by Marek Vasut 30 Mar '12

30 Mar '12

Guys, I need final test on as much platforms as possible. Can you please run these two following patches and tell me if they work with zImage and raw ramdisk for you? http://patchwork.ozlabs.org/patch/146848/ http://patchwork.ozlabs.org/patch/147440/ I can't promise they will make it to this release (I've been pestering WD pretty thoroughly (sorry about that), though I'm starting to be unhappy to merge this stuff at the verge of release myself). Best regards, Marek Vasut

3 3

[U-Boot] [PATCH V2] BOOT: Add RAW ramdisk support to bootz
by Marek Vasut 30 Mar '12

30 Mar '12

This patch allows loading RAW ramdisk via bootz command. The raw ramdisk is loaded only in case it's size is specified: bootz <kernel addr> <ramdisk addr>:<ramdisk size> <fdt addr> For example: bootz 0x42000000 0x43000000:0x12345 0x44000000 Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Warren <TWarren(a)nvidia.com> Cc: albert.u.boot(a)aribaud.net Cc: afleming(a)gmail.com, Cc: Simon Glass <sjg(a)chromium.org>, Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Nicolas Pitre <nico(a)fluxnic.net> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Detlev Zundel <dzu(a)denx.de> --- README | 5 +++++ common/cmd_bootm.c | 6 ++++-- common/image.c | 31 +++++++++++++++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) V2: Make this feature configurable Document this feature diff --git a/README b/README index b273070..43fa160 100644 --- a/README +++ b/README @@ -4422,6 +4422,11 @@ On some platforms, it's possible to boot Linux zImage. This is done using the "bootz" command. The syntax of "bootz" command is the same as the syntax of "bootm" command. +Note, defining the CONFIG_SUPPORT_INITRD_RAW allows user to supply +kernel with raw initrd images. The syntax is slightly different, the +address of the initrd must be augmented by it's size, in the following +format: "<initrd addres>:<initrd size>". + Standalone HOWTO: ================= diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9efac8b..872a49c 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1628,9 +1628,11 @@ static int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( bootz, CONFIG_SYS_MAXARGS, 1, do_bootz, "boot Linux zImage image from memory", - "[addr [initrd] [fdt]]\n - boot Linux zImage stored in memory\n" + "[addr [initrd[:size]] [fdt]]\n" + " - boot Linux zImage stored in memory\n" "\tThe argument 'initrd' is optional and specifies the address\n" - "\tof the initrd in memory.\n" + "\tof the initrd in memory. The optional argument ':size' allows\n" + "\tspecifying the size of RAW initrd.\n" #if defined(CONFIG_OF_LIBFDT) "\tWhen booting a Linux kernel which requires a flat device-tree\n" "\ta third argument is required which is the address of the\n" diff --git a/common/image.c b/common/image.c index 95c7a15..1908df6 100644 --- a/common/image.c +++ b/common/image.c @@ -797,6 +797,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, ulong rd_addr, rd_load; ulong rd_data, rd_len; const image_header_t *rd_hdr; + char *end; #if defined(CONFIG_FIT) void *fit_hdr; const char *fit_uname_config = NULL; @@ -845,10 +846,21 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, } else #endif { - rd_addr = simple_strtoul(argv[2], NULL, 16); + rd_addr = simple_strtoul(argv[2], &end, 16); debug("* ramdisk: cmdline image address = " "0x%08lx\n", rd_addr); + +#ifdef CONFIG_SUPPORT_RAW_INITRD + if (end[0] == ':') { + rd_len = simple_strtoul(++end, + NULL, 16); + debug("* ramdisk: cmdline image " + "length = 0x%08lx\n", + rd_len); + } +#endif + } #if defined(CONFIG_FIT) } else { @@ -990,9 +1002,20 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, break; #endif default: - puts("Wrong Ramdisk Image Format\n"); - rd_data = rd_len = rd_load = 0; - return 1; +#ifdef CONFIG_SUPPORT_RAW_INITRD + /* + * Check if rd_len was manually overridden, if it was, + * we're loading RAW ramdisk. + */ + if (rd_len != 0) { + rd_data = rd_addr; + } else +#endif + { + puts("Wrong Ramdisk Image Format\n"); + rd_data = rd_len = rd_load = 0; + return 1; + } } } else if (images->legacy_hdr_valid && image_check_type(&images->legacy_hdr_os_copy, -- 1.7.9

4 13

[U-Boot] [PATCH v2 0/3] Enable access to FAT filesystem in an ISO9660 El-Torito volume
by Kyle Moffett 30 Mar '12

30 Mar '12

This series fixes several bugs in the FAT code and the USB storage stack to make it possible to read from a FAT filesystem image embedded as an "El-Torito boot image" in an ISO9660 volume (IE: a CD or DVD). This has been tested on the eXMeritus HWW-1U-1A I've addressed the review commentary on these patches and I believe that they should be acceptable for merging into "next" now. Cheers, Kyle Moffett -- Interested in my work on the Debian powerpcspe port? I'm keeping a blog here: http://pureperl.blogspot.com/

3 9

[U-Boot] [PATCH] mx28evk: fix build error
by Anatolij Gustschin 30 Mar '12

30 Mar '12

Fix: drivers/mmc/libmmc.o: In function `mxsmmc_send_cmd': /home/ag/git/u-boot/drivers/mmc/mxsmmc.c:210: undefined reference to `mxs_dma_desc_append' /home/ag/git/u-boot/drivers/mmc/mxsmmc.c:211: undefined reference to `mxs_dma_go' drivers/mmc/libmmc.o: In function `mxsmmc_initialize': /home/ag/git/u-boot/drivers/mmc/mxsmmc.c:306: undefined reference to `mxs_dma_desc_alloc' Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx28evk.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index cdcc6e0..705fdab 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -126,6 +126,11 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* + * DMA + */ +#define CONFIG_APBH_DMA + +/* * MMC Driver */ #define CONFIG_ENV_IS_IN_MMC -- 1.7.7.6

3 2

[U-Boot] [PATCH 2/2] pci: declare pciauto functions in header
by Linus Walleij 30 Mar '12

30 Mar '12

The FSL PCI driver uses local prototypes for pciauto_[pre|post]scan_setup_bridge(), this does not seem right, so move them to the <pci.h> file. Fixed a small extern declaration too, this is harmless but distracts the view since all other prototypes are explicitly external. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- drivers/pci/fsl_pci_init.c | 5 ----- include/pci.h | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index d04a08c..1d75a82 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -47,11 +47,6 @@ DECLARE_GLOBAL_DATA_PTR; #define FSL_PCIE_CFG_RDY 0x4b0 #define FSL_PROG_IF_AGENT 0x1 -void pciauto_prescan_setup_bridge(struct pci_controller *hose, - pci_dev_t dev, int sub_bus); -void pciauto_postscan_setup_bridge(struct pci_controller *hose, - pci_dev_t dev, int sub_bus); - #ifndef CONFIG_SYS_PCI_MEMORY_BUS #define CONFIG_SYS_PCI_MEMORY_BUS 0 #endif diff --git a/include/pci.h b/include/pci.h index 7d98ad4..eba122f 100644 --- a/include/pci.h +++ b/include/pci.h @@ -527,8 +527,12 @@ extern void pciauto_setup_device(struct pci_controller *hose, struct pci_region *mem, struct pci_region *prefetch, struct pci_region *io); +extern void pciauto_prescan_setup_bridge(struct pci_controller *hose, + pci_dev_t dev, int sub_bus); +extern void pciauto_postscan_setup_bridge(struct pci_controller *hose, + pci_dev_t dev, int sub_bus); extern void pciauto_config_init(struct pci_controller *hose); -int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev); +extern int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev); extern pci_dev_t pci_find_device (unsigned int vendor, unsigned int device, int index); extern pci_dev_t pci_find_devices (struct pci_device_id *ids, int index); -- 1.7.7.6

2 2

[U-Boot] [PATCH 1/2] pci: get rid of local prototypes
by Linus Walleij 30 Mar '12

30 Mar '12

two boards were redeclaring pciauto_region_allocate() in their local scope for no obvious reason, the function is in <pci.h> anyway, this is probably just copying artifacts and old cruft. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- board/esd/cpci750/pci.c | 4 ---- board/prodrive/p3mx/pci.c | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/board/esd/cpci750/pci.c b/board/esd/cpci750/pci.c index 24ab13f..840385c 100644 --- a/board/esd/cpci750/pci.c +++ b/board/esd/cpci750/pci.c @@ -28,10 +28,6 @@ #ifdef CONFIG_PCI #include <pci.h> -#ifdef CONFIG_PCI_PNP -int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar); -#endif - #include "../../Marvell/include/pci.h" #undef DEBUG diff --git a/board/prodrive/p3mx/pci.c b/board/prodrive/p3mx/pci.c index 712c21c..7f4604b 100644 --- a/board/prodrive/p3mx/pci.c +++ b/board/prodrive/p3mx/pci.c @@ -28,10 +28,6 @@ #ifdef CONFIG_PCI #include <pci.h> -#ifdef CONFIG_PCI_PNP -int pciauto_region_allocate(struct pci_region* res, unsigned int size, unsigned int *bar); -#endif - #include "../../Marvell/include/pci.h" #undef DEBUG -- 1.7.7.6

2 1

[U-Boot] [PATCH 1/2] cmd_fat: add FAT write command
by Maximilian Schwerin 30 Mar '12

30 Mar '12

From: Donggeun Kim <dg77.kim at> Once CONFIG_FAT_WRITE is defined, users can invoke 'fatwrite' command that saves data in RAM as a FAT file. This patch also removes compile error after patch of 'fs/fat: Fix FAT detection to support non-DOS partition tables'. Signed-off-by: Donggeun Kim <dg77.kim <at> samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park <at> samsung.com> --- common/cmd_fat.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/fat/fat_write.c | 20 +++++++----------- 2 files changed, 65 insertions(+), 12 deletions(-) diff --git a/common/cmd_fat.c b/common/cmd_fat.c index 0220494..fef1c82 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -184,3 +184,60 @@ U_BOOT_CMD( "<interface> <dev[:part]>\n" " - print information about filesystem from 'dev' on 'interface'" ); + +#ifdef CONFIG_FAT_WRITE +static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag, + int argc, char * const argv[]) +{ + long size; + unsigned long addr; + unsigned long count; + block_dev_desc_t *dev_desc = NULL; + int dev = 0; + int part = 1; + char *ep; + + if (argc < 5) + return cmd_usage(cmdtp); + + dev = (int)simple_strtoul(argv[2], &ep, 16); + dev_desc = get_dev(argv[1], dev); + if (dev_desc == NULL) { + puts("\n** Invalid boot device **\n"); + return 1; + } + if (*ep) { + if (*ep != ':') { + puts("\n** Invalid boot device, use `dev[:part]' **\n"); + return 1; + } + part = (int)simple_strtoul(++ep, NULL, 16); + } + if (fat_register_device(dev_desc, part) != 0) { + printf("\n** Unable to use %s %d:%d for fatwrite **\n", + argv[1], dev, part); + return 1; + } + addr = simple_strtoul(argv[3], NULL, 16); + count = simple_strtoul(argv[5], NULL, 16); + + size = file_fat_write(argv[4], (void *)addr, count); + if (size == -1) { + printf("\n** Unable to write \"%s\" from %s %d:%d **\n", + argv[4], argv[1], dev, part); + return 1; + } + + printf("%ld bytes write\n", size); + + return 0; +} + +U_BOOT_CMD( + fatwrite, 6, 0, do_fat_fswrite, + "write file into a dos filesystem", + "<interface> <dev[:part]> <addr> <filename> <bytes>\n" + " - write file 'filename' from the address 'addr' in RAM\n" + " to 'dev' on 'interface'" +); +#endif diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 3bfc1c4..16f8400 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -41,23 +41,19 @@ static void uppercase(char *str, int len) } static int total_sector; -static int disk_write(__u32 startblock, __u32 getsize, __u8 *bufptr) +static int disk_write(__u32 block, __u32 nr_blocks, void *buf) { - if (cur_dev == NULL) + if (!cur_dev || !cur_dev->block_write) return -1; - if (startblock + getsize > total_sector) { + if (cur_part_info.start + block + nr_blocks > + cur_part_info.start + total_sector) { printf("error: overflow occurs\n"); return -1; } - startblock += part_offset; - - if (cur_dev->block_read) { - return cur_dev->block_write(cur_dev->dev, startblock, getsize, - (unsigned long *) bufptr); - } - return -1; + return cur_dev->block_write(cur_dev->dev, + cur_part_info.start + block, nr_blocks, buf); } /* @@ -797,7 +793,7 @@ static int check_overflow(fsdata *mydata, __u32 clustnum, unsigned long size) if (size % mydata->sect_size) sect_num++; - if (startsect + sect_num > total_sector) + if (startsect + sect_num > cur_part_info.start + total_sector) return -1; return 0; @@ -947,7 +943,7 @@ static int do_fat_write(const char *filename, void *buffer, total_sector = bs.total_sect; if (total_sector == 0) - total_sector = part_size; + total_sector = cur_part_info.size; root_cluster = bs.root_cluster; -- 1.7.0.4

5 13