April 2016 - U-Boot

[U-Boot] [PATCH] env_eeprom invalidates gd->env_addr by setting it to an offset value
by Guy Thouret 12 Apr '16

12 Apr '16

Patch to fix boot hang when using env on i2c eeprom caused by invalid gd->env_addr Signed-off-by: Guy Thouret <guy.thouret(a)wems.co.uk> Cc: Heiko Schocher <hs(a)denx.de> --- common/env_eeprom.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 72b1373..5f63a6c 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -145,11 +145,6 @@ void env_relocate_spec(void) gd->env_valid = 1; } - if (gd->env_valid == 2) - gd->env_addr = off_env[1] + offsetof(env_t, data); - else if (gd->env_valid == 1) - gd->env_addr = off_env[0] + offsetof(env_t, data); - #else /* CONFIG_ENV_OFFSET_REDUND */ ulong crc, len, new; uchar rdbuf[64]; @@ -175,10 +170,8 @@ void env_relocate_spec(void) } if (crc == new) { - gd->env_addr = offsetof(env_t, data); gd->env_valid = 1; } else { - gd->env_addr = 0; gd->env_valid = 0; } #endif /* CONFIG_ENV_OFFSET_REDUND */ -- 2.5.0

2 1

[U-Boot] [PATCH] fastboot: sparse: fix sparse blocks calculation
by Jeffy Chen 12 Apr '16

12 Apr '16

It may overflow in sparse_block_size_to_storage, use uint64_t instead in the calculation. Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> --- common/image-sparse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/image-sparse.c b/common/image-sparse.c index 542a8c4..0c07976 100644 --- a/common/image-sparse.c +++ b/common/image-sparse.c @@ -62,7 +62,8 @@ static unsigned int sparse_block_size_to_storage(unsigned int size, sparse_storage_t *storage, sparse_header_t *sparse) { - return size * sparse->blk_sz / storage->block_sz; + return (unsigned int)lldiv((uint64_t)size * sparse->blk_sz, + storage->block_sz); } static bool sparse_chunk_has_buffer(chunk_header_t *chunk) -- 2.1.4

2 1

[U-Boot] [PATCH v2 1/2] fastboot: sparse: fix block addressing for don't care chunk type
by Steve Rae 12 Apr '16

12 Apr '16

When 7bfc3b1 (sparse: Refactor chunk parsing function) was implemented, it dropped 9981945 (aboot: fix block addressing for don't care chunk type). This re-implements the required fix for the "don't care chunk type"... Signed-off-by: Steve Rae <srae(a)broadcom.com> --- Changes in v2: Handle MMC device differently than the NAND device. common/image-sparse.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/common/image-sparse.c b/common/image-sparse.c index dffe844..ef0d232 100644 --- a/common/image-sparse.c +++ b/common/image-sparse.c @@ -330,9 +330,13 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, * and go on parsing the rest of the chunks */ if (chunk_header->chunk_type == CHUNK_TYPE_DONT_CARE) { - skipped += sparse_block_size_to_storage(chunk_header->chunk_sz, - storage, - sparse_header); + blkcnt = sparse_block_size_to_storage(chunk_header->chunk_sz, + storage, + sparse_header); +#ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV + total_blocks += blkcnt; +#endif + skipped += blkcnt; continue; } @@ -380,7 +384,7 @@ int store_sparse_image(sparse_storage_t *storage, void *storage_priv, printf("........ wrote %d blocks to '%s'\n", total_blocks, storage->name); - if ((total_blocks + skipped) != + if (total_blocks != sparse_block_size_to_storage(sparse_header->total_blks, storage, sparse_header)) { printf("sparse image write failure\n"); -- 1.8.5

4 9

[U-Boot] Please pull ARC changes
by Alexey Brodkin 12 Apr '16

12 Apr '16

Hi Tom, Could you please pull changes for ARC below? The following changes since commit 9dbdc6ebd4db60effebefcf8d541cf598712e3b7: Merge branch 'master' of git://git.denx.de/u-boot-socfpga (2016-04-10 19:55:25 -0400) are available in the git repository at: git://git.denx.de/u-boot-arc.git for you to fetch changes up to 53637c911b7a2397b50690cd67b7d59145bcae9c: arc: Add virt_to_phys() stub (2016-04-11 10:20:38 -0700) ---------------------------------------------------------------- Alexey Brodkin (2): arc: get rid of running_on_hw arc: Add virt_to_phys() stub arch/arc/include/asm/global_data.h | 1 - arch/arc/include/asm/io.h | 5 +++++ arch/arc/lib/cpu.c | 6 ------ drivers/serial/serial_arc.c | 16 ---------------- 4 files changed, 5 insertions(+), 23 deletions(-) Regards, Alexey

2 1

[U-Boot] [PATCH] efi_loader: Always flush in cache line size granularity
by Alexander Graf 12 Apr '16

12 Apr '16

The cache line flush helpers only work properly when they get aligned start and end addresses. Round our flush range to cache line size. It's safe because we're guaranteed to flush within a single page which has the same cache attributes. Reported-by: Marek Vasut <marex(a)denx.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_runtime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 22bcd08..40acec0 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -194,7 +194,8 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map) #endif *p = newaddr; - flush_dcache_range((ulong)p, (ulong)&p[1]); + flush_dcache_range((ulong)p & ~(CONFIG_SYS_CACHELINE_SIZE - 1), + ALIGN((ulong)&p[1], CONFIG_SYS_CACHELINE_SIZE)); } #ifndef IS_RELA -- 1.8.5.6

4 6

[U-Boot] [PATCH] arc: get rid of running_on_hw
by Alexey Brodkin 11 Apr '16

11 Apr '16

ISS is obsolete now and nSIM is used for simulation instead. In its turn nSIM properly handles baud-rate settings so get rid of now useless check. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/include/asm/global_data.h | 1 - arch/arc/lib/cpu.c | 6 ------ drivers/serial/serial_arc.c | 16 ---------------- 3 files changed, 23 deletions(-) diff --git a/arch/arc/include/asm/global_data.h b/arch/arc/include/asm/global_data.h index d644e80..e25b966 100644 --- a/arch/arc/include/asm/global_data.h +++ b/arch/arc/include/asm/global_data.h @@ -9,7 +9,6 @@ /* Architecture-specific global data */ struct arch_global_data { - int running_on_hw; }; #include <asm-generic/global_data.h> diff --git a/arch/arc/lib/cpu.c b/arch/arc/lib/cpu.c index 4e4dd74..d1f10ab 100644 --- a/arch/arc/lib/cpu.c +++ b/arch/arc/lib/cpu.c @@ -14,12 +14,6 @@ int arch_cpu_init(void) { timer_init(); -/* In simulation (ISS) "CHIPID" and "ARCNUM" are all "ff" */ - if ((read_aux_reg(ARC_AUX_IDENTITY) & 0xffffff00) == 0xffffff00) - gd->arch.running_on_hw = 0; - else - gd->arch.running_on_hw = 1; - gd->cpu_clk = CONFIG_SYS_CLK_FREQ; gd->ram_size = CONFIG_SYS_SDRAM_SIZE; diff --git a/drivers/serial/serial_arc.c b/drivers/serial/serial_arc.c index 7dbb49f..36d6404 100644 --- a/drivers/serial/serial_arc.c +++ b/drivers/serial/serial_arc.c @@ -42,23 +42,7 @@ static int arc_serial_setbrg(struct udevice *dev, int baudrate) int arc_console_baud = gd->cpu_clk / (baudrate * 4) - 1; writeb(arc_console_baud & 0xff, &regs->baudl); - -#ifdef CONFIG_ARC - /* - * UART ISS(Instruction Set simulator) emulation has a subtle bug: - * A existing value of Baudh = 0 is used as a indication to startup - * it's internal state machine. - * Thus if baudh is set to 0, 2 times, it chokes. - * This happens with BAUD=115200 and the formaula above - * Until that is fixed, when running on ISS, we will set baudh to !0 - */ - if (gd->arch.running_on_hw) - writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh); - else - writeb(1, &regs->baudh); -#else writeb((arc_console_baud & 0xff00) >> 8, &regs->baudh); -#endif return 0; } -- 2.5.0

1 1

[U-Boot] [PATCH] arc: Add virt_to_phys() stub
by Alexey Brodkin 11 Apr '16

11 Apr '16

Commit cf7c93cdd755 "usb: ehci: Implement V2P mapping" introduced usage of virt_to_phys() in ehci-hcd. Since there was no implementation of virt_to_phys() for ARC compilation of the ehci-generic driver failed. This change adds virt_to_phys() stub for ARC so now USB driver for AXS101 board could be built again. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Hans de Goede <hdegoede(a)redhat.com> --- arch/arc/include/asm/io.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 281682c..b6f7724 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h @@ -239,4 +239,9 @@ static inline int __raw_writesl(unsigned int addr, void *data, int longlen) #define setbits_8(addr, set) setbits(8, addr, set) #define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set) +static inline phys_addr_t virt_to_phys(void *vaddr) +{ + return (phys_addr_t)((unsigned long)vaddr); +} + #endif /* __ASM_ARC_IO_H */ -- 2.5.5

2 6

[U-Boot] [PATCH] buildman: allow more incremental building
by Stephen Warren 11 Apr '16

11 Apr '16

From: Stephen Warren <swarren(a)nvidia.com> One use-case for buildman is to continually run it interactively after each small step in a large refactoring operation. This gives more immediate feedback than making a number of commits and then going back and testing them. For this to work well, buildman needs to be extremely fast. At present, a couple issues prevent it being as fast as it could be: 1) Each time buildman runs "make %_defconfig", it runs "make mrproper" first. This throws away all previous build results, requiring a from-scratch build. Optionally avoiding this would speed up the build, at the cost of potentially causing or missing some build issues. 2) A build tree is created per thread rather than per board. When a thread switches between building different boards, this often causes many files to be rebuilt due to changing config options. Using a separate build tree for each board would avoid this. This does put more strain on the system's disk cache, but it is worth it on my system at least. This commit adds two command-line options to implement the changes described above; -I ("--incremental") turns of "make mrproper" and -P ("--per-board-out-dir") creats a build directory per board rather than per thread. Tested: ./tools/buildman/buildman.py tegra ./tools/buildman/buildman.py -I -P tegra ./tools/buildman/buildman.py -b tegra_dev tegra ./tools/buildman/buildman.py -b tegra_dev -I -P tegra ... each once after deleting the buildman result/work directory, and once "incrementally" after a previous identical invocation. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- tools/buildman/builder.py | 10 ++++++++-- tools/buildman/builderthread.py | 24 ++++++++++++++++-------- tools/buildman/cmdline.py | 4 ++++ tools/buildman/control.py | 4 +++- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 141bf6469136..8ec355172901 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -205,7 +205,8 @@ class Builder: def __init__(self, toolchains, base_dir, git_dir, num_threads, num_jobs, gnu_make='make', checkout=True, show_unknown=True, step=1, - no_subdirs=False, full_path=False, verbose_build=False): + no_subdirs=False, full_path=False, verbose_build=False, + incremental=False, per_board_out_dir=False): """Create a new Builder object Args: @@ -224,6 +225,10 @@ class Builder: full_path: Return the full path in CROSS_COMPILE and don't set PATH verbose_build: Run build with V=1 and don't use 'make -s' + incremental: Always perform incremental builds; don't run make + mrproper when configuring + per_board_out_dir: Build in a separate persistent directory per + board rather than a thread-specific directory """ self.toolchains = toolchains self.base_dir = base_dir @@ -263,7 +268,8 @@ class Builder: self.queue = Queue.Queue() self.out_queue = Queue.Queue() for i in range(self.num_threads): - t = builderthread.BuilderThread(self, i) + t = builderthread.BuilderThread(self, i, incremental, + per_board_out_dir) t.setDaemon(True) t.start() self.threads.append(t) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index cf25bb8f1a7e..c512d3b521f7 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -80,11 +80,13 @@ class BuilderThread(threading.Thread): thread_num: Our thread number (0-n-1), used to decide on a temporary directory """ - def __init__(self, builder, thread_num): + def __init__(self, builder, thread_num, incremental, per_board_out_dir): """Set up a new builder thread""" threading.Thread.__init__(self) self.builder = builder self.thread_num = thread_num + self.incremental = incremental + self.per_board_out_dir = per_board_out_dir def Make(self, commit, brd, stage, cwd, *args, **kwargs): """Run 'make' on a particular commit and board. @@ -136,7 +138,11 @@ class BuilderThread(threading.Thread): if self.builder.in_tree: out_dir = work_dir else: - out_dir = os.path.join(work_dir, 'build') + if self.per_board_out_dir: + out_rel_dir = os.path.join('..', brd.target) + else: + out_rel_dir = 'build' + out_dir = os.path.join(work_dir, out_rel_dir) # Check if the job was already completed last time done_file = self.builder.GetDoneFile(commit_upto, brd.target) @@ -197,12 +203,12 @@ class BuilderThread(threading.Thread): # # Symlinks can confuse U-Boot's Makefile since # we may use '..' in our path, so remove them. - work_dir = os.path.realpath(work_dir) - args.append('O=%s/build' % work_dir) + out_dir = os.path.realpath(out_dir) + args.append('O=%s' % out_dir) cwd = None src_dir = os.getcwd() else: - args.append('O=build') + args.append('O=%s' % out_rel_dir) if self.builder.verbose_build: args.append('V=1') else: @@ -215,9 +221,11 @@ class BuilderThread(threading.Thread): # If we need to reconfigure, do that now if do_config: - result = self.Make(commit, brd, 'mrproper', cwd, - 'mrproper', *args, env=env) - config_out = result.combined + config_out = '' + if not self.incremental: + result = self.Make(commit, brd, 'mrproper', cwd, + 'mrproper', *args, env=env) + config_out += result.combined result = self.Make(commit, brd, 'config', cwd, *(args + config_args), env=env) config_out += result.combined diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 8341ab145cfa..3e3bd63e32c7 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -49,6 +49,8 @@ def ParseArgs(): parser.add_option('-i', '--in-tree', dest='in_tree', action='store_true', default=False, help='Build in the source tree instead of a separate directory') + parser.add_option('-I', '--incremental', action='store_true', + default=False, help='Do not run make mrproper (when reconfiguring)') parser.add_option('-j', '--jobs', dest='jobs', type='int', default=None, help='Number of jobs to run at once (passed to make)') parser.add_option('-k', '--keep-outputs', action='store_true', @@ -70,6 +72,8 @@ def ParseArgs(): default=False, help='Do a rough build, with limited warning resolution') parser.add_option('-p', '--full-path', action='store_true', default=False, help="Use full toolchain path in CROSS_COMPILE") + parser.add_option('-P', '--per-board-out-dir', action='store_true', + default=False, help="Use an O= (output) directory per board rather than per thread") parser.add_option('-s', '--summary', action='store_true', default=False, help='Show a build summary') parser.add_option('-S', '--show-sizes', action='store_true', diff --git a/tools/buildman/control.py b/tools/buildman/control.py index c2c54bf0e81b..aeb128a6a3e9 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -250,7 +250,9 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, options.threads, options.jobs, gnu_make=gnu_make, checkout=True, show_unknown=options.show_unknown, step=options.step, no_subdirs=options.no_subdirs, full_path=options.full_path, - verbose_build=options.verbose_build) + verbose_build=options.verbose_build, + incremental=options.incremental, + per_board_out_dir=options.per_board_out_dir,) builder.force_config_on_failure = not options.quick if make_func: builder.do_make = make_func -- 2.7.4

3 5

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 11 Apr '16

11 Apr '16

The following changes since commit 43d3fb5c0609a76409e7859a2a5800670c7b5bd2: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2016-04-06 14:17:22 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to f6060ce4bb0673bed8331441e985620b1b24adbd: arm: socfpga: Drop space after 'loadaddr=' in extra env (2016-04-10 17:19:49 +0200) ---------------------------------------------------------------- Denis Bakhvalov (1): arm: socfpga: migration of CONFIG_SPI_FLASH_BAR Marek Vasut (4): arm: socfpga: Handle phy-mode OF property for GMACs arm: socfpga: sockit: Use more relaxed DRAM timings arm: socfpga: Nuke useless include arm: socfpga: Drop space after 'loadaddr=' in extra env arch/arm/mach-socfpga/include/mach/dwmmc.h | 12 ---------- arch/arm/mach-socfpga/misc.c | 40 +++++++++++++++++++++++++++++---- board/terasic/sockit/qts/iocsr_config.h | 116 +++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------ board/terasic/sockit/qts/pll_config.h | 14 ++++++------ board/terasic/sockit/qts/sdram_config.h | 30 ++++++++++++------------- configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 1 + configs/socfpga_mcvevk_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + drivers/mmc/socfpga_dw_mmc.c | 1 - include/configs/socfpga_arria5_socdk.h | 2 +- include/configs/socfpga_common.h | 2 -- include/configs/socfpga_cyclone5_socdk.h | 2 +- include/configs/socfpga_de0_nano_soc.h | 2 +- include/configs/socfpga_sockit.h | 2 +- include/configs/socfpga_socrates.h | 2 +- include/configs/socfpga_sr1500.h | 2 +- 20 files changed, 129 insertions(+), 105 deletions(-) delete mode 100644 arch/arm/mach-socfpga/include/mach/dwmmc.h

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 11 Apr '16

11 Apr '16

The following changes since commit 43d3fb5c0609a76409e7859a2a5800670c7b5bd2: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2016-04-06 14:17:22 -0400) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 192eab9357473e09218e0a4448b220d691d9d886: dm: usb: Do not reprobe usb hosts on "usb tree" command (2016-04-10 17:18:43 +0200) ---------------------------------------------------------------- Hans de Goede (4): usb: kbd: Do not deregister usbkbd twice when using dm musb: sunxi: Do not allocate musb struct multiple times musb: Properly call musb_stop() on probe failure dm: usb: Do not reprobe usb hosts on "usb tree" command Mateusz Kulikowski (1): usb: ehci-hcd: Fix crash when no ops are provided to ehci_register() Purna Chandra Mandal (4): arm: add missing writes[bwql], reads[bwql]. drivers: remove writes{b,w,l,q} and reads{b,w,l,q}. drivers: musb-new: Add USB DRC driver for Microchip PIC32 OTG controller. board: pic32mzda: enable USB-host, USB-storage support. Sriram Dash (4): drivers:usb:common:fsl-dt-fixup: Move device-tree fixup framework to common file drivers:usb:common:fsl-dt-fixup: Remove code duplication for fdt_usb_get_node_type drivers:usb:common:fsl-dt-fixup: Add device-tree fixup support for xhci controller drivers:usb:common:fsl-dt-fixup: fix return value of fdt_usb_get_node_type Steve Rae (1): usb: bcm_udc_otg: enable clocks Makefile | 1 + arch/arm/include/asm/io.h | 7 +++ arch/mips/dts/pic32mzda.dtsi | 12 +++++ arch/mips/dts/pic32mzda_sk.dts | 4 ++ cmd/usb.c | 10 ++-- common/usb_kbd.c | 3 +- configs/pic32mzdask_defconfig | 6 +++ drivers/mtd/nand/pxa3xx_nand.c | 8 --- drivers/usb/common/Makefile | 7 +++ drivers/usb/common/fsl-dt-fixup.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/bcm_udc_otg_phy.c | 4 ++ drivers/usb/host/ehci-fsl.c | 195 -------------------------------------------------------------------- drivers/usb/host/ehci-hcd.c | 4 +- drivers/usb/musb-new/Kconfig | 7 +++ drivers/usb/musb-new/Makefile | 1 + drivers/usb/musb-new/linux-compat.h | 7 --- drivers/usb/musb-new/musb_core.c | 2 +- drivers/usb/musb-new/musb_uboot.c | 4 +- drivers/usb/musb-new/pic32.c | 288 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb-new/sunxi.c | 11 ++-- include/configs/pic32mzdask.h | 7 +++ include/fdt_support.h | 4 +- 22 files changed, 570 insertions(+), 224 deletions(-) create mode 100644 drivers/usb/common/Makefile create mode 100644 drivers/usb/common/fsl-dt-fixup.c create mode 100644 drivers/usb/musb-new/pic32.c

2 1