December 2015 - U-Boot

[U-Boot] [PULL] Please pull u-boot-nios/master
by Thomas Chou 06 Dec '15

06 Dec '15

The following changes since commit 9eed48c8bec98425dbd995dd72c40e9ad7a8c26b: Merge branch 'master' of http://git.denx.de/u-boot-sparc (2015-12-04 17:50:34 -0500) are available in the git repository at: git://git.denx.de/u-boot-nios.git master for you to fetch changes up to f118fe5cf960702f5d57e4f60ec3e488215544dc: altera_qspi: fix erase and write error code (2015-12-06 11:31:29 +0800) ---------------------------------------------------------------- Thomas Chou (2): altera_qspi: add lock unlock ops altera_qspi: fix erase and write error code drivers/mtd/altera_qspi.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)

1 0

[U-Boot] [PATCH 1/2] altera_qspi: add lock unlock ops
by Thomas Chou 06 Dec '15

06 Dec '15

Add lock() and unlock() mtd ops to altera_qspi. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- drivers/mtd/altera_qspi.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/mtd/altera_qspi.c b/drivers/mtd/altera_qspi.c index 50c6e0e..89f04a4 100644 --- a/drivers/mtd/altera_qspi.c +++ b/drivers/mtd/altera_qspi.c @@ -46,10 +46,24 @@ struct altera_qspi_platdata { flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* FLASH chips info */ +static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, + uint64_t *len); + void flash_print_info(flash_info_t *info) { + struct mtd_info *mtd = info->mtd; + loff_t ofs; + uint64_t len; + printf("Altera QSPI flash Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count); + altera_qspi_get_locked_range(mtd, &ofs, &len); + printf(" %08lX +%lX", info->start[0], info->size); + if (len) { + printf(", protected %08lX +%lX", + info->start[0] + (ulong)ofs, (ulong)len); + } + putc('\n'); } int flash_erase(flash_info_t *info, int s_first, int s_last) @@ -171,6 +185,72 @@ static void altera_qspi_sync(struct mtd_info *mtd) { } +static void altera_qspi_get_locked_range(struct mtd_info *mtd, loff_t *ofs, + uint64_t *len) +{ + struct udevice *dev = mtd->dev; + struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_regs *regs = pdata->regs; + u32 stat = readl(&regs->rd_status); + unsigned pow = ((stat >> 2) & 0x7) | ((stat >> 3) & 0x8); + + *ofs = 0; + *len = 0; + if (pow) { + *len = mtd->erasesize << (pow - 1); + if (!(stat & 0x20)) + *ofs = mtd->size - *len; + } +} + +static int altera_qspi_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len) +{ + struct udevice *dev = mtd->dev; + struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_regs *regs = pdata->regs; + u32 sector_start, sector_end; + uint64_t num_sectors; + u32 mem_op; + u32 sr_bp; + u32 sr_tb; + + num_sectors = mtd->size / mtd->erasesize; + sector_start = ofs / mtd->erasesize; + sector_end = (ofs + len) / mtd->erasesize; + + if (sector_start >= num_sectors / 2) { + sr_bp = fls(num_sectors - 1 - sector_start) + 1; + sr_tb = 0; + } else if (sector_end < num_sectors / 2) { + sr_bp = fls(sector_end) + 1; + sr_tb = 1; + } else { + sr_bp = 15; + sr_tb = 0; + } + + mem_op = (sr_tb << 12) | (sr_bp << 8); + mem_op |= QUADSPI_MEM_OP_SECTOR_PROTECT; + debug("lock %08x\n", mem_op); + writel(mem_op, &regs->mem_op); + + return 0; +} + +static int altera_qspi_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) +{ + struct udevice *dev = mtd->dev; + struct altera_qspi_platdata *pdata = dev_get_platdata(dev); + struct altera_qspi_regs *regs = pdata->regs; + u32 mem_op; + + mem_op = QUADSPI_MEM_OP_SECTOR_PROTECT; + debug("unlock %08x\n", mem_op); + writel(mem_op, &regs->mem_op); + + return 0; +} + static int altera_qspi_probe(struct udevice *dev) { struct altera_qspi_platdata *pdata = dev_get_platdata(dev); @@ -196,6 +276,8 @@ static int altera_qspi_probe(struct udevice *dev) mtd->_read = altera_qspi_read; mtd->_write = altera_qspi_write; mtd->_sync = altera_qspi_sync; + mtd->_lock = altera_qspi_lock; + mtd->_unlock = altera_qspi_unlock; mtd->numeraseregions = 0; mtd->erasesize = 0x10000; if (add_mtd_device(mtd)) -- 2.5.0

3 11

[U-Boot] [PATCH] spl: mmc: Fix compiler warning
by Marek Vasut 05 Dec '15

05 Dec '15

Fix the following warning: common/spl/spl_mmc.c: In function 'spl_mmc_load_image': common/spl/spl_mmc.c:31:24: warning: 'mmc' may be used uninitialized in this function [-Wmaybe-uninitialized] count = mmc->block_dev.block_read(0, sector, 1, header); ^ common/spl/spl_mmc.c:251:14: note: 'mmc' was declared here struct mmc *mmc; ^ The fix is as simple as initializing the struct mmc *mmc to NULL, so the subsequent functions can check if the variable is set or not. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Pantelis Antoniou <panto(a)antoniou-consulting.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Simon Glass <sjg(a)chromium.org> --- common/spl/spl_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index b3c2c64..43748d0 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -248,7 +248,7 @@ int spl_mmc_do_fs_boot(struct mmc *mmc) int spl_mmc_load_image(u32 boot_device) { - struct mmc *mmc; + struct mmc *mmc = NULL; u32 boot_mode; int err = 0; __maybe_unused int part; -- 2.1.4

2 2

[U-Boot] [PATCH 0/5] arm: ls1021a: merge SoC specific code in a separate file
by Yuan Yao 05 Dec '15

05 Dec '15

Yuan Yao(5): arm: ls1021a: merge SoC specific code in a separate file arm: ls102xa: enable all the snoop signal for masters. ls102xa: Enable snoop and DVM message requests. armv7/fsl-ls102xa: Workaround for DDR erratum A008514 Changed in v2: Update the write value to 63b2_0042h; move erratum a008336 and a008514 to soc specific file Changed in v2: Update the patch commit message.

3 7

[U-Boot] Please pull u-boot-sparc/master
by Francois Retief 04 Dec '15

04 Dec '15

Hello Tom, Please pull from u-boot-sparc master: The following changes since commit be30dfbabbee12770221f434d2aa08627e712b97: iocon: Disable FIT_VERBOSE (2015-12-01 15:49:42 -0500) are available in the git repository at: http://git.denx.de/u-boot-sparc.git master for you to fetch changes up to 7a4fb11b85939b47738283c3a7ae7f461468e274: sparc: Remove non-generic board init files: board.c, time.c (2015-12-03 13:15:50 +0200) ---------------------------------------------------------------- Daniel Hellstrom (6): sparc: Added function that checks if IRQ is on or off sparc: Serial baud rate register support multiple buses with different frequency sparc: leon3: Clear all unused GPTIMER registers. sparc: Removed USB stop from linux bootm, arch-independent bootm stop USB sparc: leon3: Added CPU count and frequency detection. sparc: leon3: Added busy wait function, made wait_ms() work when IRQ is disabled Francois Retief (15): sparc: Move SYS_SPARC_NWINDOWS to Kconfig sparc: Remove version_string variable from start.S file sparc: leon3: Clear GD_FLAG_SERIAL_READY flag on AMBA failure sparc: leon3: Updated serial driver to use CONFIG_CONS_INDEX sparc: Fix whitespace in cpu/leon2/cpu_init.c sparc: Initial ground work for generic board initialization sparc: leon3: Move snoop detection from startup.S to arch_cpu_init() sparc: leon3: Move ambapp_bus_init() call to arch_cpu_init() function sparc: leon3: Updates for generic board initialization sparc: leon2: Updates for generic board initialization sparc: Update cpu_init.c to use generic timer infrastructure sparc: Update PROM initialization code for generic board sparc: Add CONFIG_DISPLAY_BOARDINFO variable to all LEON boards sparc: Use microseconds instead of ticks for timeout sparc: Remove non-generic board init files: board.c, time.c arch/Kconfig | 1 + arch/sparc/Kconfig | 9 + arch/sparc/cpu/leon2/cpu.c | 14 +- arch/sparc/cpu/leon2/cpu_init.c | 94 +++------ arch/sparc/cpu/leon2/interrupts.c | 14 -- arch/sparc/cpu/leon2/prom.c | 2 + arch/sparc/cpu/leon2/serial.c | 2 +- arch/sparc/cpu/leon2/start.S | 213 +++++++++++-------- arch/sparc/cpu/leon3/ambapp.c | 2 +- arch/sparc/cpu/leon3/cpu.c | 60 +++++- arch/sparc/cpu/leon3/cpu_init.c | 175 ++++++++------- arch/sparc/cpu/leon3/interrupts.c | 11 - arch/sparc/cpu/leon3/prom.c | 2 + arch/sparc/cpu/leon3/serial.c | 23 +- arch/sparc/cpu/leon3/start.S | 303 +++++++++++++------------- arch/sparc/cpu/leon3/usb_uhci.c | 7 +- arch/sparc/include/asm/config.h | 8 +- arch/sparc/include/asm/global_data.h | 9 +- arch/sparc/include/asm/irq.h | 3 + arch/sparc/include/asm/leon3.h | 13 ++ arch/sparc/include/asm/u-boot.h | 36 +--- arch/sparc/lib/Makefile | 4 +- arch/sparc/lib/board.c | 398 ----------------------------------- arch/sparc/lib/bootm.c | 8 - arch/sparc/lib/interrupts.c | 42 +--- arch/sparc/lib/time.c | 62 ------ common/board_f.c | 20 +- common/board_r.c | 10 +- drivers/net/greth.c | 2 +- include/configs/gr_cpci_ax2000.h | 8 +- include/configs/gr_ep2s60.h | 8 +- include/configs/gr_xc3s_1500.h | 8 +- include/configs/grsim.h | 8 +- include/configs/grsim_leon2.h | 12 +- 34 files changed, 602 insertions(+), 989 deletions(-) delete mode 100644 arch/sparc/lib/board.c delete mode 100644 arch/sparc/lib/time.c

2 1

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 04 Dec '15

04 Dec '15

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 1d149eddcc0661b683002f76a8240491eba00dbb: dm: Add timeline and guide for porting serial drivers (2015-11-20 13:59:54 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to a80a999c9b5c128cad2f67b4b32036bd4d667904: arm: imx6: novena: Enable extfs support in SPL (2015-12-01 16:11:08 +0100) ---------------------------------------------------------------- Marek Vasut (3): arm: mx6: Reduce SPL malloc pool size arm: imx6: novena, gw_ventana: Fix use of pfuze100 bit definitions arm: imx6: novena: Enable extfs support in SPL Michael Heimpold (1): ARM: mxs: fix VDDD brownout setting Otavio Salvador (6): cgtqmx6eval: Add SPI NOR flash support cgtqmx6eval: Use SPI NOR to store the environment cgtqmx6eval: Add fastboot support cgtqmx6eval: Add SPL support iomux-v3: Take MX6D in consideration for imx_iomux_v3_setup_pad() cgtqmx6eval: Add DFU support Peng Fan (1): video: ipu: simplify if else code Sanchayan Maity (1): colibri_vf: Add board_usb_phy_mode function Ye.Li (1): mx6: clock: Modify GPMI clock to support mx6sx arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 4 +- arch/arm/cpu/armv7/mx6/Kconfig | 3 + arch/arm/cpu/armv7/mx6/clock.c | 12 +++ arch/arm/include/asm/imx-common/iomux-v3.h | 2 +- board/congatec/cgtqmx6eval/README | 78 +++++++++++++---- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 599 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------- board/congatec/cgtqmx6eval/imximage.cfg | 143 ------------------------------ board/gateworks/gw_ventana/common.c | 2 +- board/kosagi/novena/novena.c | 2 +- board/toradex/colibri_vf/colibri_vf.c | 33 ++++++- configs/{cgtqmx6qeval_defconfig => cgtqmx6eval_defconfig} | 5 +- drivers/video/ipu_disp.c | 4 +- include/configs/cgtqmx6eval.h | 68 ++++++++++++-- include/configs/imx6_spl.h | 6 +- include/configs/novena.h | 1 + 15 files changed, 689 insertions(+), 273 deletions(-) delete mode 100644 board/congatec/cgtqmx6eval/imximage.cfg rename configs/{cgtqmx6qeval_defconfig => cgtqmx6eval_defconfig} (72%) -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] Pull request: u-boot-video/master
by Anatolij Gustschin 04 Dec '15

04 Dec '15

Hi Tom, The following changes since commit be30dfbabbee12770221f434d2aa08627e712b97: iocon: Disable FIT_VERBOSE (2015-12-01 15:49:42 -0500) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to f5bcfe151e61558572b9f9036c67d51bd831a436: Revert "LCD: Add an option to skip registration as an stdio output" (2015-12-02 15:46:58 +0100) ---------------------------------------------------------------- Anatolij Gustschin (1): Revert "LCD: Add an option to skip registration as an stdio output" common/lcd.c | 13 ------------- 1 file changed, 13 deletions(-) Please pull. Thanks! Anatolij

2 1

[U-Boot] [PATCH] common: cli_simple: Recursively parse variables
by Nishanth Menon 04 Dec '15

04 Dec '15

When we use the following in bootargs: v1=abc v2=123-${v1} echo $v2 we get 123-${v1} This is because we do not recursively check to see if v2 by itself has a hidden variable. Fix the same with recursive call Signed-off-by: Nishanth Menon <nm(a)ti.com> --- Testing with sandbox: http://pastebin.ubuntu.com/13672432/ common/cli_simple.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common/cli_simple.c b/common/cli_simple.c index 9c3d073d583b..63bda32c57e4 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -134,11 +134,17 @@ void cli_simple_process_macros(const char *input, char *output) envval = getenv(envname); /* Copy into the line if it exists */ - if (envval != NULL) - while ((*envval) && outputcnt) { - *(output++) = *(envval++); + if (envval != NULL) { + char finalval[CONFIG_SYS_CBSIZE], *f; + + cli_simple_process_macros(envval, + finalval); + f = finalval; + while ((*f) && outputcnt) { + *(output++) = *(f++); outputcnt--; } + } /* Look for another '$' */ state = 0; } -- 2.6.2.402.g2635c2b

2 1

[U-Boot] [PATCH 00/12] ns16550: add generic binding to unify the drivers
by Thomas Chou 04 Dec '15

04 Dec '15

Add generic binding to unify ns16550 drivers. There are several drivers using almost the same code, such as serial_dw, serial_keystone, serial_omap, serial_ppc, serial_rockchip, serial_tegra.c, and serial_x86. But each is platform specific. The key difference between these drivers is the way to get input clock frequency. With this unified approach, fixed clock frequency should be extracted from "clock-frequency" property of device tree blob. If this property is not available, the macro CONFIG_SYS_NS16550_CLK will be used. It can be a constant or a function to get clock, eg, get_serial_clock(). Thomas Chou (11): debug_uart: restore ns16550 as default arc: add mapping between physical and virtual address ns16550: change map_sysmem to map_physmem ns16550: add generic binding to unify the drivers ns16550: unify serial_x86 ns16550: unify serial_ppc ns16550: unify serial_rockchip ns16550: unify serial_keystone ns16550: unify serial_dw ns16550: unify serial_tegra ns16550: unify serial_omap arch/arc/include/asm/io.h | 28 +++++++++++++++++ arch/arm/mach-rockchip/Kconfig | 8 ++++- arch/powerpc/Kconfig | 4 +++ arch/powerpc/include/asm/config.h | 4 +++ arch/x86/Kconfig | 4 +++ arch/x86/dts/serial.dtsi | 2 +- board/isee/igep00x0/igep00x0.c | 2 +- board/lge/sniper/sniper.c | 2 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/logicpd/zoom1/zoom1.c | 2 +- board/overo/overo.c | 2 +- board/quipos/cairo/cairo.c | 2 +- board/ti/beagle/beagle.c | 2 +- board/timll/devkit8000/devkit8000.c | 2 +- configs/efi-x86_defconfig | 2 +- configs/k2g_evm_defconfig | 1 - drivers/serial/Kconfig | 40 ++++++++++-------------- drivers/serial/Makefile | 7 ----- drivers/serial/ns16550.c | 59 ++++++++++++++++++++++++++++++++++-- drivers/serial/serial_dw.c | 39 ------------------------ drivers/serial/serial_keystone.c | 48 ----------------------------- drivers/serial/serial_omap.c | 54 --------------------------------- drivers/serial/serial_ppc.c | 40 ------------------------ drivers/serial/serial_rockchip.c | 43 -------------------------- drivers/serial/serial_tegra.c | 54 --------------------------------- drivers/serial/serial_x86.c | 44 --------------------------- include/configs/am43xx_evm.h | 4 +-- include/configs/cm_t43.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/omap3_pandora.h | 3 +- include/configs/sniper.h | 4 +-- include/configs/sunxi-common.h | 2 +- include/configs/tb100.h | 2 +- include/configs/tegra-common.h | 3 +- include/configs/ti_am335x_common.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/ti_omap3_common.h | 4 +-- include/configs/ti_omap4_common.h | 4 +-- include/configs/ti_omap5_common.h | 4 +-- 39 files changed, 149 insertions(+), 386 deletions(-) delete mode 100644 drivers/serial/serial_dw.c delete mode 100644 drivers/serial/serial_keystone.c delete mode 100644 drivers/serial/serial_omap.c delete mode 100644 drivers/serial/serial_ppc.c delete mode 100644 drivers/serial/serial_rockchip.c delete mode 100644 drivers/serial/serial_tegra.c delete mode 100644 drivers/serial/serial_x86.c -- 2.5.0

8 111

[U-Boot] [PATCH] dm: core: Enable optional use of fdt_translate_address()
by Stefan Roese 04 Dec '15

04 Dec '15

The current "simple" address translation simple_bus_translate() is not working on some platforms (e.g. MVEBU). As here more complex "ranges" properties are used in many nodes (multiple tuples etc). This patch enables the optional use of the common fdt_translate_address() function which handles this translation correctly. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/core/Kconfig | 30 ++++++++++++++++++++++++++++++ drivers/core/device.c | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 41f4e69..15681df 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -120,4 +120,34 @@ config SPL_SIMPLE_BUS Supports the 'simple-bus' driver, which is used on some systems in SPL. +config OF_TRANSLATE + bool "Translate addresses using fdt_translate_address" + depends on DM && OF_CONTROL + default y + help + If this option is enabled, the reg property will be translated + using the fdt_translate_address() function. This is necessary + on some platforms (e.g. MVEBU) using complex "ranges" + properties in many nodes. As this translation is not handled + correctly in the default simple_bus_translate() function. + + If this option is not enabled, simple_bus_translate() will be + used for the address translation. This function is faster and + smaller in size than fdt_translate_address(). + +config SPL_OF_TRANSLATE + bool "Translate addresses using fdt_translate_address" + depends on SPL_DM && SPL_OF_CONTROL + default n + help + If this option is enabled, the reg property will be translated + using the fdt_translate_address() function. This is necessary + on some platforms (e.g. MVEBU) using complex "ranges" + properties in many nodes. As this translation is not handled + correctly in the default simple_bus_translate() function. + + If this option is not enabled, simple_bus_translate() will be + used for the address translation. This function is faster and + smaller in size than fdt_translate_address(). + endmenu diff --git a/drivers/core/device.c b/drivers/core/device.c index a6cd936..0cf73cf 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -11,6 +11,7 @@ #include <common.h> #include <fdtdec.h> +#include <fdt_support.h> #include <malloc.h> #include <dm/device.h> #include <dm/device-internal.h> @@ -580,7 +581,12 @@ fdt_addr_t dev_get_addr(struct udevice *dev) fdt_addr_t addr; addr = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg"); - if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) { + if (CONFIG_IS_ENABLED(OF_TRANSLATE)) { + const fdt32_t *reg = fdt_getprop(gd->fdt_blob, dev->of_offset, + "reg", NULL); + addr = fdt_translate_address((void *)gd->fdt_blob, + dev->of_offset, reg); + } else if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) { if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS) addr = simple_bus_translate(dev->parent, addr); } -- 2.5.1

6 29