June 2014 - U-Boot

[U-Boot] [PATCH] .gitignore: drop include/asm/proc from ignore pattern
by Masahiro Yamada 19 Jun '14

19 Jun '14

Commit 7d89982b stopped creating symbolic link arch/${arch}/include/asm/proc. arch/.gitignore should be updated. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Vasili Galka <vvv444(a)gmail.com> --- Vasili, Commit 7d89982b is a very good clean-up. Thanks!! arch/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/.gitignore b/arch/.gitignore index a1fbe01..2714b86 100644 --- a/arch/.gitignore +++ b/arch/.gitignore @@ -1,2 +1 @@ /*/include/asm/arch -/*/include/asm/proc -- 1.9.1

2 1

[U-Boot] [PATCH] fs: ext4: fix writing zero-length files
by Stephen Warren 19 Jun '14

19 Jun '14

From: Stephen Warren <swarren(a)nvidia.com> ext4fs_allocate_blocks() always allocates at least one block for a file. If the file size is zero, this causes total_remaining_blocks to underflow, which then causes an apparent hang while 2^32 blocks are allocated. To solve this, check that total_remaining_blocks is non-zero as part of the loop condition (i.e. before each loop) rather than at the end of the loop. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- fs/ext4/ext4_common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 1c1172163c09..33d69c9c71f0 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -1380,7 +1380,7 @@ void ext4fs_allocate_blocks(struct ext2_inode *file_inode, unsigned int no_blks_reqd = 0; /* allocation of direct blocks */ - for (i = 0; i < INDIRECT_BLOCKS; i++) { + for (i = 0; total_remaining_blocks && i < INDIRECT_BLOCKS; i++) { direct_blockno = ext4fs_get_new_blk_no(); if (direct_blockno == -1) { printf("no block left to assign\n"); @@ -1390,8 +1390,6 @@ void ext4fs_allocate_blocks(struct ext2_inode *file_inode, debug("DB %ld: %u\n", direct_blockno, total_remaining_blocks); total_remaining_blocks--; - if (total_remaining_blocks == 0) - break; } alloc_single_indirect_block(file_inode, &total_remaining_blocks, -- 1.8.1.5

2 1

[U-Boot] [PATCH v2 0/9] Refactoring and Endian bug fixes of fdt_support
by Masahiro Yamada 19 Jun '14

19 Jun '14

Masahiro Yamada (9): fdt_support: delete unnecessary DECLARE_GLOBAL_DATA_PTR fdt_support: refactor with fdt_find_or_add_subnode helper func fdt_support: delete force argument of fdt_initrd() fdt_support: delete force argument of fdt_chosen() fdt_support: refactor fdt_fixup_stdout() function fdt_support: add 'const' qualifier for unchanged argument fdt_support: fix an endian bug of fdt_fixup_memory_banks fdt_support: fix an endian bug of fdt_initrd() fdt_support: correct the return condition of fdt_initrd() arch/microblaze/lib/bootm.c | 2 +- common/cmd_fdt.c | 4 +- common/fdt_support.c | 295 +++++++++++++++++++++----------------------- common/image-fdt.c | 4 +- include/fdt_support.h | 4 +- 5 files changed, 151 insertions(+), 158 deletions(-) -- 1.8.3.2

3 29

[U-Boot] [PATCH] freescale: m5253demo: fix unused-but-set-variable warnings
by Masahiro Yamada 19 Jun '14

19 Jun '14

Fix the following warning messages: In function 'flash_erase': 180:21: warning: variable 'last' set but not used [-Wunused-but-set-variable] In function 'write_buff': 322:10: warning: variable 'port_width' set but not used [-Wunused-but-set-variable] Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> --- board/freescale/m5253demo/flash.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index 387e454..16bba59 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -177,7 +177,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) { FPWV *addr; int flag, prot, sect, count; - ulong type, start, last; + ulong type, start; int rcode = 0, flashtype = 0; if ((s_first < 0) || (s_first > s_last)) { @@ -217,7 +217,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) flag = disable_interrupts(); start = get_timer(0); - last = start; if ((s_last - s_first) == (CONFIG_SYS_SST_SECT - 1)) { if (prot == 0) { @@ -319,14 +318,13 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) { ulong wp, count; u16 data; - int rc, port_width; + int rc; if (info->flash_id == FLASH_UNKNOWN) return 4; /* get lower word aligned address */ wp = addr; - port_width = sizeof(FPW); /* handle unaligned start bytes */ if (wp & 1) { -- 1.8.3.2

2 1

[U-Boot] [PATCH v2] libfdt: Fix segfault when calling fit_check_format() on corrupt FIT images
by Tom Rini 19 Jun '14

19 Jun '14

From: Jon Nalley <lists(a)bluebot.org> It has been observed that fit_check_format() will fail when passed a corrupt FIT image. This was tracked down to _fdt_string_eq(): return (strlen(p) == len) && (memcmp(p, s, len) == 0); In the case of a corrupt FIT image one can't depend on 'p' being NULL terminated. I changed it to use strnlen() to fix the issue. Signed-off-by: Tom Rini <trini(a)ti.com> --- Changes in v2: - Pass len + 1, not len to strnlen as that's the best practice for strnlen. --- lib/libfdt/fdt_ro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfdt/fdt_ro.c b/lib/libfdt/fdt_ro.c index f2154e8..36af043 100644 --- a/lib/libfdt/fdt_ro.c +++ b/lib/libfdt/fdt_ro.c @@ -44,7 +44,7 @@ static int _fdt_string_eq(const void *fdt, int stroffset, { const char *p = fdt_string(fdt, stroffset); - return (strlen(p) == len) && (memcmp(p, s, len) == 0); + return (strnlen(p, len + 1) == len) && (memcmp(p, s, len) == 0); } int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size) -- 1.7.9.5

1 1

[U-Boot] [PATCH] m68k:correct io macros about endian
by Chao Fu 19 Jun '14

19 Jun '14

From: Chao Fu <B44548(a)freescale.com> M68k is big endian cpu ,so use be_out and be_in in big endian. Signed-off-by: Chao Fu <b44548(a)freescale.com> --- arch/m68k/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k/include/asm/io.h b/arch/m68k/include/asm/io.h index 5a87a9b..2d2a519 100644 --- a/arch/m68k/include/asm/io.h +++ b/arch/m68k/include/asm/io.h @@ -32,10 +32,10 @@ #define writew(b,addr) ((*(volatile u16 *) (addr)) = (b)) #define writel(b,addr) ((*(volatile u32 *) (addr)) = (b)) #else -#define readw(addr) in_le16((volatile u16 *)(addr)) -#define readl(addr) in_le32((volatile u32 *)(addr)) -#define writew(b,addr) out_le16((volatile u16 *)(addr),(b)) -#define writel(b,addr) out_le32((volatile u32 *)(addr),(b)) +#define readw(addr) in_be16((volatile u16 *)(addr)) +#define readl(addr) in_be32((volatile u32 *)(addr)) +#define writew(b,addr) out_be16((volatile u16 *)(addr),(b)) +#define writel(b,addr) out_be32((volatile u32 *)(addr),(b)) #endif /* -- 1.8.4

2 1

[U-Boot] [PATCH 0/3] All M68K boards are broken
by Masahiro Yamada 19 Jun '14

19 Jun '14

Hello. Even after applying the patch "config.mk: fix -fstack-usage support test" (http://patchwork.ozlabs.org/patch/283619/), I still cannot compile m68k correctly. The result of `CROSS_COMPILE=m68k-linux- ./MAKEALL -a m68k` is --------------------- SUMMARY ---------------------------- Boards compiled: 50 Boards with errors: 6 ( M5253DEMO M54455EVB M54455EVB_a66 M54455EVB_i66 M54455EVB_intel M54455EVB_stm33 ) Boards with warnings but no errors: 44 ( M52277EVB M52277EVB_stmicro M5235EVB M5235EVB_Flash32 idmr cobra5272 eb_cpu5282 eb_cpu5282_internal TASREG M5208EVBE M5249EVB M5253EVBE M5271EVB M5272C3 M5275EVB M5282EVB astro_mcf5373l M53017EVB M5329AFEE M5329BFEE M5373EVB M54418TWR M54418TWR_nand_mii M54418TWR_nand_rmii M54418TWR_nand_rmii_lowfreq M54418TWR_serial_mii M54418TWR_serial_rmii M54451EVB M54451EVB_stmicro M5475AFE M5475BFE M5475CFE M5475DFE M5475EFE M5475FFE M5475GFE M5485AFE M5485BFE M5485CFE M5485DFE M5485EFE M5485FFE M5485GFE M5485HFE ) ---------------------------------------------------------- I just took a look and I found lots of files are left broken for a long term. I pick up some them here. (1) drivers/i2c/i2c_core.c i2c_core.c: In function 'i2c_reloc_fixup': i2c_core.c:63:20: warning: assignment from incompatible pointer type [enabled by default] i2c_core.c:67:21: warning: assignment from incompatible pointer type [enabled by default] i2c_core.c:71:20: warning: assignment from incompatible pointer type [enabled by default] i2c_core.c:76:21: warning: assignment from incompatible pointer type [enabled by default] i2c_core.c:81:29: warning: assignment from incompatible pointer type [enabled by default] (2) arch/m68k/lib/bootm.c bootm.c:53:8: warning: unused variable 'rd_len' [-Wunused-variable] bootm.c:99:12: warning: 'initrd_start' may be used uninitialized in this function [-Wuninitialized] bootm.c:99:12: warning: 'initrd_end' may be used uninitialized in this function [-Wuninitialized] bootm.c:99:12: warning: 'cmd_start' may be used uninitialized in this function [-Wuninitialized] bootm.c:99:12: warning: 'cmd_end' may be used uninitialized in this function [-Wuninitialized] (3) arch/m68k/cpu/mcf5445x/cpu_init.c cpu_init.c:367:21: warning: unused variable 'info' [-Wunused-variable] (4) cpu_init.c:48:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] arch/m68k/include/asm/io.h:207:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' cpu_init.c:49:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] arch/m68k/include/asm/io.h:207:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' (5) include/configs/M5253DEMO.h:1:1: error: unknown type name 'TABILITY' include/configs/M5253DEMO.h:1:13: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'FITNESS' include/configs/M5253DEMO.h:1:13: error: unknown type name 'FITNESS' include/configs/M5253DEMO.h:2:2: error: stray '@' in program (6) cpu_init.c: In function 'cpu_init_f': cpu_init.c:211:10: warning: unused variable 'wdog' [-Wunused-variable] (7) mcf5373l.c: In function 'initdram': mcf5373l.c:83:5: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness [-Wpointer-sign] include/common.h:456:6: note: expected 'long int *' but argument is of type 'long unsigned int *' (8) fpga.c:168:2: warning: initialization from incompatible pointer type [enabled by default] fpga.c:168:2: warning: (near initialization for 'altera_fns.write') [enabled by default] fpga.c: In function 'astro5373l_altera_load': fpga.c:196:20: warning: assignment from incompatible pointer type [enabled by default] (9) speed.c: In function 'setup_5441x_clocks': speed.c:118:2: warning: passing argument 1 of 'in_be16' makes pointer from integer without a cast [enabled by default] arch/m68k/include/asm/io.h:177:19: note: expected 'volatile u16 *' but argument is of type 'u16' (10) fsl_i2c.c:50:39: error: 'CONFIG_SYS_FSL_I2C_OFFSET' undeclared here (not in a function) I began to fix some of them and I gave up on the way. Who is the custodian of M68K? I doubt M68K is maintained. Masahiro Yamada (3): i2c: eliminate warnings in i2c_reloc_fixup function m68k: eliminate warnings in do_bootm_linux function m68k: eliminate a warning in cpu_init arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- arch/m68k/lib/bootm.c | 7 ++++++- drivers/i2c/i2c_core.c | 12 +++++------- 3 files changed, 12 insertions(+), 9 deletions(-) -- 1.8.1.2

4 9

[U-Boot] [PATCH] ARM: fdt support: Add usbethaddr as an acceptable MAC
by Dan Murphy 19 Jun '14

19 Jun '14

A board that has a USB ethernet device only may set the usbetheraddr and not the ethaddr. ethaddr will be the default MAC address that is chosen and if that is not populated then the usbethaddr is looked at. If neither are set then then device tree blob is not modified. Signed-off-by: Dan Murphy <dmurphy(a)ti.com> --- common/fdt_support.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index b034c98..fef7e60 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -450,8 +450,18 @@ void fdt_fixup_ethernet(void *fdt) if (node < 0) return; + if (!getenv("ethaddr")) { + if (getenv("usbethaddr")) { + strcpy(mac, "usbethaddr"); + } else { + debug("No ethernet MAC Address defined\n"); + return; + } + } else { + strcpy(mac, "ethaddr"); + } + i = 0; - strcpy(mac, "ethaddr"); while ((tmp = getenv(mac)) != NULL) { sprintf(enet, "ethernet%d", i); path = fdt_getprop(fdt, node, enet, NULL); -- 1.7.9.5

2 6

Re: [U-Boot] [PATCH 1/6] usb: ehci: mx6: Add support for i.MX6SL
by Nikolay Dimitrov 19 Jun '14

19 Jun '14

Hi Igor, My personal opinion is that unless you intend to run the binary on multiple IMX6 variants, there's no need to do expensive checks in runtime, when you can do the same at compile-time. For me it's the same as choosing puts() vs printf() - you know at compile time whether you need to print arguments or not, so same with the USB controller base address - you know in advance that you target a specific CPU variant and not the other ones. To a certain extent I agree that it would be awesome to have the same code running on all IMX6 variants, but the run-time checks will increase somewhat the binary footprint and U-Boot community has already gone to great efforts to remove unnecessary bloat. My personal assumption is that such generic approach would be more tolerated in the Linux kernel. Kind regards, Nikolay On 6/16/2014 1:00 PM, u-boot-request(a)lists.denx.de wrote: > Message: 30 Date: Mon, 16 Jun 2014 10:05:08 +0300 From: Igor Grinberg > <grinberg(a)compulab.co.il> Subject: Re: [U-Boot] [PATCH 1/6] usb: ehci: > mx6: Add support for i.MX6SL To: Otavio Salvador > <otavio(a)ossystems.com.br>, U-Boot Mailing List <u-boot(a)lists.denx.de> > Cc: Marek Vasut <marex(a)denx.de>, Fabio Estevam > <fabio.estevam(a)freescale.com> Message-ID: > <539E9724.4020809(a)compulab.co.il> Content-Type: text/plain; > charset=ISO-8859-1 Hmmm... Can't this be done dynamically? I mean... > you can check the SoC type in runtime, right? And then substitute the > correct address in a variable or so... I would really prefer such kind > of things done in runtime. > -- Regards, Igor.

3 6

[U-Boot] FIT: how to store MACs in a DTB
by Yegor Yefremov 19 Jun '14

19 Jun '14

AFAIK one can store MACs in a DTB from u-boot via loading DTB in RAM and changing nodes values. How should this work with a FIT image? Is there any howto? System: am335x Yegor

2 2