November 2012 - U-Boot

[U-Boot] [PATCH] fs: fat: Fix mkcksum() function parameters
by Marek Vasut 09 Jan '13

09 Jan '13

The mkcksum() function now takes one parameter, the pointer to 11-byte wide character array, which it then operates on. Currently, the function is wrongly passed (dir_entry)->name, which is only 8-byte wide character array. Though by further inspecting the dir_entry structure, it can be noticed that the name[8] entry is immediatelly followed by ext[3] entry. Thus, name[8] and ext[3] in the dir_entry structure actually work as this 11-byte wide array since they're placed right next to each other by current compiler behavior. Depending on this is obviously wrong, thus fix this by correctly passing both (dir_entry)->name and (dir_entry)->ext to the mkcksum() function and adjust the function appropriately. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)ti.com> --- fs/fat/fat.c | 20 ++++++++++++-------- fs/fat/fat_write.c | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 41ae15e..8870292 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -567,15 +567,16 @@ get_vfatname(fsdata *mydata, int curclust, __u8 *cluster, } /* Calculate short name checksum */ -static __u8 mkcksum(const char *str) +static __u8 mkcksum(const char name[8], const char ext[3]) { int i; __u8 ret = 0; - for (i = 0; i < 11; i++) { - ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + str[i]; - } + for (i = 0; i < sizeof(name); i++) + ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + name[i]; + for (i = 0; i < sizeof(ext); i++) + ret = (((ret & 1) << 7) | ((ret & 0xfe) >> 1)) + ext[i]; return ret; } @@ -678,7 +679,8 @@ static dir_entry *get_dentfromdir(fsdata *mydata, int startsect, return NULL; } #ifdef CONFIG_SUPPORT_VFAT - if (dols && mkcksum(dentptr->name) == prevcksum) { + __u8 csum = mkcksum(dentptr->name, dentptr->ext); + if (dols && csum == prevcksum) { prevcksum = 0xffff; dentptr++; continue; @@ -946,13 +948,16 @@ do_fat_read_at(const char *filename, unsigned long pos, void *buffer, for (i = 0; i < DIRENTSPERBLOCK; i++) { char s_name[14], l_name[VFAT_MAXLEN_BYTES]; + __u8 csum; l_name[0] = '\0'; if (dentptr->name[0] == DELETED_FLAG) { dentptr++; continue; } - if ((dentptr->attr & ATTR_VOLUME)) { + + csum = mkcksum(dentptr->name, dentptr->ext); + if (dentptr->attr & ATTR_VOLUME) { #ifdef CONFIG_SUPPORT_VFAT if ((dentptr->attr & ATTR_VFAT) == ATTR_VFAT && (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) { @@ -1015,8 +1020,7 @@ do_fat_read_at(const char *filename, unsigned long pos, void *buffer, goto exit; } #ifdef CONFIG_SUPPORT_VFAT - else if (dols == LS_ROOT && - mkcksum(dentptr->name) == prevcksum) { + else if (dols == LS_ROOT && csum == prevcksum) { prevcksum = 0xffff; dentptr++; continue; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 5829adf..97a18cb 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -335,7 +335,7 @@ fill_dir_slot(fsdata *mydata, dir_entry **dentptr, const char *l_name) /* Get short file name and checksum value */ strncpy(s_name, (*dentptr)->name, 16); - checksum = mkcksum(s_name); + checksum = mkcksum(*dentptr->name, *dentptr->ext); do { memset(slotptr, 0x00, sizeof(dir_slot)); -- 1.7.10.4

4 5

[U-Boot] [PATCH v1 0/1] Factorize ARM startup code as mush as possible.
by Albert ARIBAUD 08 Jan '13

08 Jan '13

File crt0.S is introduced which contains the C runtime framework, that is, the assembly code responsible for setting up the C environments needed by board_init_*() and relocate_code(). Corresponding code is removed from all start.S files in arch/arm. This precedes further factorization, e.g. relocate_code() and possibly also the exception handlers. This has the nice side effect of turning board_init_*() and relocate_code() into normal C functions, too. Albert ARIBAUD (1): arm: move generic startup code in crt0.S arch/arm/cpu/arm1136/start.S | 62 ++-------- arch/arm/cpu/arm1176/start.S | 62 ++-------- arch/arm/cpu/arm720t/start.S | 53 ++------- arch/arm/cpu/arm920t/start.S | 61 ++-------- arch/arm/cpu/arm925t/start.S | 61 ++-------- arch/arm/cpu/arm926ejs/start.S | 80 ++----------- arch/arm/cpu/arm946es/start.S | 56 ++------- arch/arm/cpu/arm_intcm/start.S | 63 ++-------- arch/arm/cpu/armv7/start.S | 58 +++------- arch/arm/cpu/ixp/start.S | 55 ++------- arch/arm/cpu/pxa/start.S | 63 ++-------- arch/arm/cpu/s3c44b0/start.S | 55 ++------- arch/arm/cpu/sa1100/start.S | 50 ++------ arch/arm/lib/Makefile | 2 + arch/arm/lib/board.c | 11 -- arch/arm/lib/crt0.S | 179 +++++++++++++++++++++++++++++ include/common.h | 2 +- lib/asm-offsets.c | 10 ++ nand_spl/board/freescale/mx31pdk/Makefile | 6 +- nand_spl/board/karo/tx25/Makefile | 6 +- 20 files changed, 322 insertions(+), 673 deletions(-) create mode 100644 arch/arm/lib/crt0.S -- 1.7.9.5

7 46

[U-Boot] Secure update of uboot devices?
by Andreas Bäck 08 Jan '13

08 Jan '13

With the new threats like Stuxnet and Duqu one need to improve on how new updates to software is distrubuted to devcies so one can be sure that it's not a hacked or modified software that runs in the device. We use uboot + usb stick to update the software in our devices. Have anyone been trying out to add e.g cryptated,certificates or rsa keys to uboot?

5 6

[U-Boot] [PATCH 00/13] mxc nand: Add support for i.MX5
by Benoît Thébaudeau 08 Jan '13

08 Jan '13

Hi all, This series aims at adding support for i.MX5 to the mxc nand mtd and spl drivers. It also fixes several issues and cleans up the code a little bit. Best regards, Benoît

8 61

[U-Boot] [PATCH v7] qi_lb60: add nand spl support
by xiangfu＠openmobilefree.net 08 Jan '13

08 Jan '13

From: Xiangfu <xiangfu(a)openmobilefree.net> Big thanks to Tom Rini, Daniel Schwierzeck and Marek Vasut for feedback. For the usbboot code. I can not fast re-write them to u-boot USB sub-system. but I don't want wait. so let's finish the nand spl code first. :) V7: * fix typo V6: * remove usbboot code * add u-boot-xburst.bin rule to main Makefile V5: * use puts instread of serial_puts (enable CONFIG_SPL_LIBCOMMON_SUPPORT) * update my email address * fix compiles warnings V4: * split to 2 patches (nand spl/usbbot) * remove use define string.c using CONFIG_SPL_LIBGENERIC_SUPPORT * fix checkputch.pl warnings V3: * add simpile string.c to mips/lib * some cleanup on jz4740.c * move to new spl/ structure * support software usbboot mode Xiangfu (1): qi_lb60: add nand spl support Makefile | 12 +++ arch/mips/cpu/xburst/Makefile | 7 +- arch/mips/cpu/xburst/cpu.c | 4 + arch/mips/cpu/xburst/jz4740.c | 82 +++++++---------- arch/mips/cpu/xburst/spl/Makefile | 47 ++++++++++ arch/mips/cpu/xburst/spl/start.S | 63 +++++++++++++ board/qi/qi_lb60/Makefile | 4 + board/qi/qi_lb60/qi_lb60-spl.c | 30 +++++++ board/qi/qi_lb60/qi_lb60.c | 8 +- board/qi/qi_lb60/u-boot-spl.lds | 61 +++++++++++++ drivers/mtd/nand/jz4740_nand.c | 39 ++++++++- include/configs/qi_lb60.h | 175 ++++++++++++++++++------------------- 12 files changed, 386 insertions(+), 146 deletions(-) create mode 100644 arch/mips/cpu/xburst/spl/Makefile create mode 100644 arch/mips/cpu/xburst/spl/start.S create mode 100644 board/qi/qi_lb60/qi_lb60-spl.c create mode 100644 board/qi/qi_lb60/u-boot-spl.lds -- 1.7.9.5

4 5

[U-Boot] [PATCH 0/2] arm: rmobile: kzm9g: Adjust initial hardware setting
by Tetsuyuki Kobayashi 07 Jan '13

07 Jan '13

Hello Albert, After long term test for KZM-A9-GT board (aka. kzm9g), I found some adjustment for initial hardware setting. I hope this patch set merged to v2013.01 release. Tetsuyuki Kobayashi (2): arm: rmobile: kzm9g: Adjust SDRAM setting arm: rmobile: kzm9g: Adjust ETM trace clock board/kmc/kzm9g/kzm9g.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) -- 1.7.9.5

2 6

[U-Boot] [PATCH 1/2] video:cache:fix: Buffer alignment and dcache flush for lcd subsystem
by Lukasz Majewski 07 Jan '13

07 Jan '13

This commit makes the video subsystem code cache aware. Memory allocated for decompressed BMP memory is now cache line aligned. Flushing of the dcache is also performed after copying BMP data to fb address. Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> Cc: Anatolij Gustschin <agust(a)denx.de> --- common/cmd_bmp.c | 2 +- common/lcd.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index b8809e3..7d3f45a 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -54,7 +54,7 @@ bmp_image_t *gunzip_bmp(unsigned long addr, unsigned long *lenp) * Decompress bmp image */ len = CONFIG_SYS_VIDEO_LOGO_MAX_SIZE; - dst = malloc(CONFIG_SYS_VIDEO_LOGO_MAX_SIZE); + dst = memalign(CONFIG_SYS_CACHELINE_SIZE, len); if (dst == NULL) { puts("Error: malloc in gunzip failed!\n"); return NULL; diff --git a/common/lcd.c b/common/lcd.c index 506a138..b092a11 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -802,6 +802,9 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } fb -= (lcd_line_length + width * (bpix / 8)); } + flush_dcache_range((unsigned long) fb, + (unsigned long) fb + + (lcd_line_length * height)); break; #endif /* CONFIG_BMP_32BPP */ default: -- 1.7.2.3

6 12

[U-Boot] [PATCH 00/32] Initial sparse fix series
by Kim Phillips 06 Jan '13

06 Jan '13

This 32-patch series only begins to address making u-boot source more 'sparseable,' or sparse-clean, ultimately to catch type, address space, and endianness mismatches and generally improve code quality. E.g., in this initial dose whose main purpose is to reduce the output volume to workable levels, a couple of endianness bugs are found and fixed in of_bus_default_translate() and fdt_get_base_address(). See [PATCH 14/32] common/fdt_support.c: sparse fixes. Patch 1 adds endianness attributes to byteorder.h helpers, e.g., cpu_to_be32(). This is required for correct operation and prevents sparse from emitting false-positives. Patches 2-6 fix issues where u-boot had imported linux header code and the importer simply force-#defined sparse-specific attributes to nothing, to allow u-boot to build. Patches 7-10 are general sparse fixes to common header areas. Patch 11 is too, which also changes the long-standing u-boot image header types to __be32, as per u-boot image definition. Patches 12-14 address further misc. sparse issues in common/. Patches 15-16 do the same for the net subsystem. Patches 17-18 do the same for lib/. Patch 19 for include/fdt.h. Patches 20-23 for Power Arch's mpc8xxx, 83xx, and 85xx subsystems. Last but not least, patches 24-32 attempt to clean up various drivers. Note that there are two libfdt dependencies: 1. commits aa28b89b "libfdt: Add helpers for 64-bit integer properties" and commit 786ed04 "libfdt: Add support for appending the values to a existing property", currently sitting in u-boot-fdt/next. This series is based on today's mainline u-boot/next with those two patches pre-applied. 2. potential upstream dtc change dependencies, due to having to attribute base device tree header types to __be32 in include/libfdt. See patch 19/32 "include/fdt.h: sparse fixes". It is unknown whether such changes would be welcome to dtc (but there's a way to find out :). For authors of new patches not willing to sift through the still quite large sparse output for their board/platform, though interested in what sparse has to say about their new code, it is recommended to build with make C=1 after changes such that sparse output will only include newly built code. For your convenience, I've pushed the series onto the u-boot-mpc83xx tree, 'sparsefixes' branch [1]. The branch includes libfdt dependency #1 mentioned above. Build-tested in both endians :). Please help test. Thanks, Kim [1] see http://git.denx.de/u-boot.git/?p=u-boot/u-boot-mpc83xx.git;a=shortlog;h=ref… Kim Phillips (32): include/linux/byteorder: import latest endian definitions from linux include/linux/compat.h: fix warning: preprocessor token __iomem redefined include/linux/unaligned/generic.h: fix warning: preprocessor token __force redefined include/linux/stddef.h: avoid 'warning: preprocessor token offsetof redefined' arch/powerpc/include/asm/io.h: fix warning: preprocessor token __iomem redefined arch/powerpc/lib/bootm.c: fix noinline attribute arch/powerpc/lib/extable.c: sparse fix arch/powerpc/lib/board.c,*traps.c: sparse fixes include/common.h: sparse fix include/command.h: sparse fix include/image.h: sparse fixes common/cmd_*.c: sparse fixes common/misc: sparse fixes common/fdt_support.c: sparse fixes net/: sparse fixes drivers/net/: sparse fixes lib/zlib: sparse fixes lib/vsprintf.c: sparse fixes include/fdt.h: sparse fixes arch/powerpc/cpu/mpc8xxx/: sparse fixes arch/powerpc/cpu/mpc85xx/fdt.c: sparse fixes powerpc/mpc85xx: sparse fixes powerpc/mpc83xx: sparse fixes drivers/block/: sparse fixes drivers/gpio/mpc83xx_gpio.c: sparse fixes drivers/input/input.c: sparse fix drivers/i2c/fsl_i2c.c: sparse fix drivers/mmc/mmc.c: sparse fixes drivers/mmc/fsl_esdhc.c: sparse fixes drivers/mtd/cfi_flash.c: sparse fixes drivers/mtd/nand: sparse fixes drivers/serial/serial_ns16550.c: sparse fixes arch/powerpc/cpu/74xx_7xx/traps.c | 6 +- arch/powerpc/cpu/mpc512x/traps.c | 6 +- arch/powerpc/cpu/mpc5xx/traps.c | 6 +- arch/powerpc/cpu/mpc5xxx/traps.c | 6 +- arch/powerpc/cpu/mpc8220/traps.c | 6 +- arch/powerpc/cpu/mpc824x/traps.c | 6 +- arch/powerpc/cpu/mpc8260/traps.c | 6 +- arch/powerpc/cpu/mpc83xx/fdt.c | 4 +- arch/powerpc/cpu/mpc83xx/speed.c | 4 +- arch/powerpc/cpu/mpc83xx/traps.c | 6 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 2 +- arch/powerpc/cpu/mpc85xx/fdt.c | 57 +++++---- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 2 +- arch/powerpc/cpu/mpc85xx/traps.c | 6 +- arch/powerpc/cpu/mpc86xx/traps.c | 6 +- arch/powerpc/cpu/mpc8xx/traps.c | 6 +- arch/powerpc/cpu/mpc8xxx/cpu.c | 8 +- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 2 +- .../cpu/mpc8xxx/ddr/lc_common_dimm_params.c | 4 +- arch/powerpc/cpu/mpc8xxx/fdt.c | 3 +- arch/powerpc/cpu/mpc8xxx/fsl_lbc.c | 2 +- arch/powerpc/cpu/ppc4xx/traps.c | 6 +- arch/powerpc/include/asm/io.h | 1 - arch/powerpc/lib/board.c | 12 +- arch/powerpc/lib/bootm.c | 2 +- arch/powerpc/lib/extable.c | 2 +- board/freescale/common/ngpixis.c | 10 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 24 ++-- board/freescale/mpc8568mds/bcsr.c | 8 +- board/freescale/mpc8569mds/bcsr.c | 8 +- common/cmd_boot.c | 5 +- common/cmd_bootm.c | 27 +++-- common/cmd_console.c | 2 +- common/cmd_date.c | 2 +- common/cmd_echo.c | 2 +- common/cmd_exit.c | 2 +- common/cmd_fat.c | 5 +- common/cmd_fdt.c | 19 +-- common/cmd_flash.c | 6 +- common/cmd_help.c | 2 +- common/cmd_i2c.c | 18 +-- common/cmd_irq.c | 2 +- common/cmd_itest.c | 4 +- common/cmd_load.c | 44 +++---- common/cmd_mdio.c | 20 +-- common/cmd_mem.c | 25 ++-- common/cmd_misc.c | 2 +- common/cmd_mmc.c | 6 +- common/cmd_mp.c | 20 ++- common/cmd_mtdparts.c | 28 +++-- common/cmd_nand.c | 17 +-- common/cmd_net.c | 8 +- common/cmd_nvedit.c | 23 ++-- common/cmd_pci.c | 15 ++- common/cmd_reginfo.c | 3 +- common/cmd_sata.c | 4 +- common/cmd_setexpr.c | 2 +- common/cmd_source.c | 11 +- common/cmd_test.c | 6 +- common/cmd_usb.c | 30 ++--- common/cmd_version.c | 2 +- common/cmd_ximg.c | 11 +- common/command.c | 9 +- common/console.c | 2 +- common/dlmalloc.c | 36 +++--- common/fdt_support.c | 78 ++++++------ common/hush.c | 30 ++--- common/image.c | 8 +- common/main.c | 6 +- common/update.c | 1 + common/usb_storage.c | 20 +-- common/xyzModem.c | 6 +- drivers/block/fsl_sata.c | 79 ++---------- drivers/block/fsl_sata.h | 12 +- drivers/block/sata_sil.c | 13 +- drivers/gpio/mpc83xx_gpio.c | 4 +- drivers/i2c/fsl_i2c.c | 2 +- drivers/input/input.c | 2 +- drivers/mmc/fsl_esdhc.c | 4 +- drivers/mmc/mmc.c | 37 +++--- drivers/mtd/cfi_flash.c | 20 +-- drivers/mtd/nand/nand_base.c | 9 +- drivers/mtd/nand/nand_ecc.c | 1 + drivers/net/fm/eth.c | 2 +- drivers/net/fm/p1023.c | 2 +- drivers/net/fm/p4080.c | 2 +- drivers/net/fm/p5020.c | 2 +- drivers/net/fm/tgec_phy.c | 10 +- drivers/net/phy/atheros.c | 2 +- drivers/net/phy/phy.c | 19 +-- drivers/net/phy/vitesse.c | 2 +- drivers/net/vsc7385.c | 1 + drivers/qe/qe.h | 34 +++--- drivers/serial/serial_ns16550.c | 12 +- include/command.h | 2 +- include/common.h | 4 - include/fdt.h | 33 ++--- include/fdt_support.h | 4 +- include/image.h | 15 +-- include/libfdt.h | 4 +- include/linux/byteorder/big_endian.h | 135 ++++++++++++++------- include/linux/byteorder/little_endian.h | 133 +++++++++++++------- include/linux/byteorder/swab.h | 6 +- include/linux/compat.h | 3 - include/linux/stddef.h | 2 + include/linux/unaligned/generic.h | 3 - include/net.h | 9 +- include/u-boot/zlib.h | 2 +- lib/libfdt/fdt.c | 2 +- lib/libfdt/fdt_ro.c | 2 +- lib/libfdt/fdt_rw.c | 4 +- lib/libfdt/fdt_sw.c | 4 +- lib/libfdt/fdt_wip.c | 2 +- lib/vsprintf.c | 4 +- lib/zlib/adler32.c | 5 +- lib/zlib/inffast.c | 5 +- lib/zlib/inflate.c | 29 ++--- lib/zlib/inftrees.c | 10 +- lib/zlib/zutil.c | 10 +- net/arp.c | 6 +- net/bootp.c | 6 +- net/net.c | 2 +- net/ping.h | 3 - net/tftp.h | 3 + 124 files changed, 789 insertions(+), 730 deletions(-) -- 1.7.12.3

15 116

[U-Boot] [PATCH] mx35pdk:Use IMX_GPIO_NR macro
by Ashok Kumar Reddy 05 Jan '13

05 Jan '13

Use IMX_GPO_NR macro Signed-off-by: Ashok Kumar Reddy <ashokkourla2000(a)gmail.com> --- board/freescale/mx35pdk/mx35pdk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c index 7cb6b30..e9b3827 100644 --- a/board/freescale/mx35pdk/mx35pdk.c +++ b/board/freescale/mx35pdk/mx35pdk.c @@ -246,7 +246,7 @@ int board_late_init(void) mxc_request_iomux(MX35_PIN_COMPARE, MUX_CONFIG_GPIO); mxc_iomux_set_input(MUX_IN_GPIO1_IN_5, INPUT_CTL_PATH0); - gpio_direction_output(37, 1); + gpio_direction_output(IMX_GPIO_NR(2, 5), 1); } val = mc9sdz60_reg_read(MC9SDZ60_REG_GPIO_1) | 0x04; -- 1.7.9.5

2 2

[U-Boot] [PATCH 0/9] USB: Gadget & DFU related fixes (v3)
by Pantelis Antoniou 04 Jan '13

04 Jan '13

Third take of USB + DFU updates. Pantelis Antoniou (9): usb: Fix bug when both DFU & ETHER are defined g_dnl: Issue connect/disconnect as appropriate g_dnl: Properly terminate string list. dfu: Only perform DFU board_usb_init() for TRATS dfu: Fix crash when wrong number of arguments given dfu: Send correct DFU response from composite_setup dfu: Properly zero out timeout value dfu: Add a partition type target dfu: Support larger than memory transfers. common/cmd_dfu.c | 5 +- drivers/dfu/dfu.c | 244 ++++++++++++++++++++++++++++-------- drivers/dfu/dfu_mmc.c | 109 ++++++++++++---- drivers/usb/gadget/Makefile | 8 +- drivers/usb/gadget/composite.c | 27 ++++ drivers/usb/gadget/ep0.c | 1 + drivers/usb/gadget/f_dfu.c | 9 +- drivers/usb/gadget/g_dnl.c | 12 +- include/configs/am335x_evm.h | 1 + include/configs/am3517_evm.h | 1 + include/configs/h2200.h | 1 + include/configs/omap3_beagle.h | 1 + include/configs/s5p_goni.h | 1 + include/configs/s5pc210_universal.h | 1 + include/configs/trats.h | 1 + include/dfu.h | 21 +++- 16 files changed, 356 insertions(+), 87 deletions(-) -- 1.7.12

3 13