May 2016 - U-Boot

[U-Boot] [PATCH] video: ipu: Fix build with hard-float ARM toolchain
by Guillaume GARDET 19 May '16

19 May '16

Build with hard-float ARM toolchain was broken by commit 3cb4f25c: 'video: ipu: avoid overflow issue'. To fix it, we use do_div function. Build tested for mx6qsabrelite_defconfig. Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Peng Fan <van.freenix(a)gmail.com> Cc: Sandor Yu <sandor.yu(a)nxp.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Tom Rini <trini(a)konsulko.com> --- drivers/video/ipu_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 36d4b23..e319c82 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -352,7 +352,8 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate) */ __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); - clk->rate = (u64)(clk->parent->rate * 16) / div; + do_div(parent_rate, div); + clk->rate = parent_rate; return 0; } -- 1.8.4.5

4 3

[U-Boot] should more use be made of "CONFIG_IS_ENABLED()" macro?
by Robert P. J. Day 19 May '16

19 May '16

two questions. first, was perusing include/image.h, familiar with snippets like this: #define IMAGE_ENABLE_FIT CONFIG_IS_ENABLED(FIT) #define IMAGE_ENABLE_OF_LIBFDT CONFIG_IS_ENABLED(OF_LIBFDT) but further down the same file, seems like more content could be rewritten that way: #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH # define IMAGE_ENABLE_RAMDISK_HIGH 1 #else # define IMAGE_ENABLE_RAMDISK_HIGH 0 #endif #ifdef CONFIG_SYS_BOOT_GET_CMDLINE # define IMAGE_BOOT_GET_CMDLINE 1 #else # define IMAGE_BOOT_GET_CMDLINE 0 #endif ... etc etc ... isn't that amenable to the same rewriting? and, second, from include/linux/kconfig.h, what is the difference between IS_ENABLED() and CONFIG_IS_ENABLED(): /* * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm', * 0 otherwise. * */ #define IS_ENABLED(option) \ (config_enabled(option) || config_enabled(option##_MODULE)) ... snip ... /* * CONFIG_IS_ENABLED(FOO) evaluates to * 1 if CONFIG_SPL_BUILD is undefined and CONFIG_FOO is set to 'y' or 'm', * 1 if CONFIG_SPL_BUILD is defined and CONFIG_SPL_FOO is set to 'y' or 'm', * 0 otherwise. */ #define CONFIG_IS_ENABLED(option) \ (config_enabled(CONFIG_VAL(option)) || \ config_enabled(CONFIG_VAL(option##_MODULE))) i'm sure if i kept reading, i'd understand the difference, but the comment above that second #define doesn't seem to clarify it, since it refers to "CONFIG_SPL_*" while the definition mentions nothing about SPL. perhaps a more expansive comment would make things clearer in terms of where to use one rather than the other. rday p.s. there is some potentially confusing usage of that macro, like this within the same source file drivers/core/device.c: $ grep -r IS_ENABLED drivers/core/device.c if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS)) { if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) { #if CONFIG_IS_ENABLED(OF_CONTROL) if (CONFIG_IS_ENABLED(OF_TRANSLATE)) { if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) { #if CONFIG_IS_ENABLED(OF_CONTROL) $ so within the same source file, CONFIG_IS_ENABLED() is being used for both compile-time *and* run-time testing. um, yuck. IMHO, the compile-time testing should use the standard test of: #ifdef CONFIG_OF_CONTROL for consistency. it just seems messy to be bouncing back and forth between the two usages. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

1 0

[U-Boot] [PATCH] video: ipu: Use lldiv() for 64-bit division in ipu_pixel_clk_set_rate()
by Andrew Shadura 19 May '16

19 May '16

Fix compilation problems with a hardfloat toolchain on ARM (libgcc.a(_udivmoddi4.o) uses VFP register arguments, u-boot does not). Cast clk->parent->rate to u64 before the multiplication to avoid overflowing a 32-bit value. Bug introduced by 3cb4f25cc702db17455583599d0940c81337a17a. Signed-off-by: Andrew Shadura <andrew.shadura(a)collabora.co.uk> --- drivers/video/ipu_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 36d4b23..dad3e6f 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -352,7 +352,7 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate) */ __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); - clk->rate = (u64)(clk->parent->rate * 16) / div; + clk->rate = lldiv((u64)clk->parent->rate * 16, div); return 0; } -- 2.7.4

1 0

[U-Boot] [PATCH RESEND 0/2] cmd: fdt: Add device tree overlays support
by Maxime Ripard 19 May '16

19 May '16

Hi, The device tree overlays are a great solution to the issue raised by the bunch expandable boards we find everywhere these days, like the Beaglebone, Raspberry Pi or CHIP. However, most of the time, the overlays are applied through a mechanism involving the firmware request interface in Linux, that is only fully functional once the userspace has been mounted and is running. Some expansion boards might need to be enabled before that, because they simply need to patch the DT early on, or need to be initialized early in order to be fully functional, or because they provide access to the root filesystem. In these cases, having the bootloader applying the overlay before Linux starts seems like the easiest solution. This implementation doesn't provide all the Linux fancyness though, there's no transactional application, which means that if the overlay cannot be applied for a reason while you're still halfway through the application, you're probably screwed. It also cannot remove an overlay, but I don't think that is currently a use-case. Let me know what you think, Maxime Maxime Ripard (2): cmd: fdt: Narrow the check for fdt addr cmd: fdt: add fdt overlay application subcommand cmd/Makefile | 2 +- cmd/fdt.c | 21 ++- cmd/fdt_overlay.c | 464 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/fdt_support.h | 2 +- 4 files changed, 486 insertions(+), 3 deletions(-) create mode 100644 cmd/fdt_overlay.c -- 2.8.0

5 13

[U-Boot] [PATCH 0/3] dm: gpio: Add driver for MPC85xx GPIO controller
by Mario Six 19 May '16

19 May '16

The functions for accessing GPIOs on MPC85xx are hardcoded in arch/powerpc/include/asm/mpc85xx_gpio.h This leads to problems if another GPIO controller supporting the driver model is to be used simultaneously. Therefore, this patch moves the "static" functions into a DM-compatible driver, and also introduces a set of functions into the GPIO uclass that expose the controller's capability to switch individual GPIOs into open-drain-mode. Mario Six (3): dm: gpio: Add driver for MPC85XX GPIO controller dm: gpio: Add methods for open drain setting dm: gpio: Implement open drain for MPC85XX GPIO arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 + arch/powerpc/include/asm/immap_85xx.h | 2 + drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-uclass.c | 30 ++++ drivers/gpio/mpc85xx_gpio.c | 223 +++++++++++++++++++++++++++ include/asm-generic/gpio.h | 29 ++++ 7 files changed, 293 insertions(+) create mode 100644 drivers/gpio/mpc85xx_gpio.c -- 2.7.0.GIT

3 21

[U-Boot] [PATCH v2] test/py: Support setting up specific timeout
by Michal Simek 19 May '16

19 May '16

Large file transfers, flash erasing and more complicated tests requires more time to finish. Provide a way to setup specific timeout directly in test. For example description for 50s test: timeout = 50000 with u_boot_console.temporary_timeout(timeout): u_boot_console.run_command(...) Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - save console.p instead of simple console - Some fixes in comments - Save orig_timeout directly in class - Remove get_spawn call - Test if self.p exists test/py/u_boot_console_base.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index f7434363fbcb..dbbdd53b46dc 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -56,6 +56,24 @@ class ConsoleDisableCheck(object): self.console.disable_check_count[self.check_type] -= 1 self.console.eval_bad_patterns() +class ConsoleSetupTimeout(object): + """Context manager (for Python's with statement) that temporarily sets up + timeout for specific command. This is useful when execution time is greater + then default 30s.""" + + def __init__(self, console, timeout): + self.p = console.p + self.orig_timeout = self.p.timeout + self.p.timeout = timeout + + def __enter__(self): + return self + + def __exit__(self, extype, value, traceback): + if not self.p: + return + self.p.timeout = self.orig_timeout + class ConsoleBase(object): """The interface through which test functions interact with the U-Boot console. This primarily involves executing shell commands, capturing their @@ -391,3 +409,18 @@ class ConsoleBase(object): """ return ConsoleDisableCheck(self, check_type) + + def temporary_timeout(self, timeout): + """Temporarily set up different timeout for commands. + + Create a new context manager (for use with the "with" statement) which + temporarily change timeout. + + Args: + timeout: Time in milliseconds. + + Returns: + A context manager object. + """ + + return ConsoleSetupTimeout(self, timeout) -- 1.9.1

2 2

[U-Boot] [PATCH] imx: mx7: implement reset_misc
by Peng Fan 19 May '16

19 May '16

We need to power down lcdif to make 'reset' can pass stress test. Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/cpu/armv7/mx7/soc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c index 073bbc6..ef46c92 100644 --- a/arch/arm/cpu/armv7/mx7/soc.c +++ b/arch/arm/cpu/armv7/mx7/soc.c @@ -441,3 +441,11 @@ void s_init(void) return; } + +void reset_misc(void) +{ +#ifdef CONFIG_VIDEO_MXS + lcdif_power_down(); +#endif +} + -- 2.6.2

1 0

[U-Boot] [PATCH 1/2] board: amcore: update to use dm serial driver
by Angelo Dureghello 19 May '16

19 May '16

Update amcore board to use dm serial driver. Signed-off-by: Angelo Dureghello <angelo(a)sysam.it> --- board/sysam/amcore/amcore.c | 15 ++++++++++++++- configs/amcore_defconfig | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/board/sysam/amcore/amcore.c b/board/sysam/amcore/amcore.c index 42b7c23..b7217c5 100644 --- a/board/sysam/amcore/amcore.c +++ b/board/sysam/amcore/amcore.c @@ -1,7 +1,7 @@ /* * Board functions for Sysam AMCORE (MCF5307 based) board * - * (C) Copyright 2015 Angelo Dureghello <angelo(a)sysam.it> + * (C) Copyright 2016 Angelo Dureghello <angelo(a)sysam.it> * * SPDX-License-Identifier: GPL-2.0+ * @@ -11,6 +11,8 @@ #include <common.h> #include <asm/immap.h> #include <asm/io.h> +#include <dm.h> +#include <dm/platform_data/serial_coldfire.h> void init_lcd(void) { @@ -99,3 +101,14 @@ phys_size_t initdram(int board_type) return get_ram_size(CONFIG_SYS_SDRAM_BASE, CONFIG_SYS_SDRAM_SIZE); } + +static struct coldfire_serial_platdata mcf5307_serial_plat = { + .base = CONFIG_SYS_UART_BASE, + .port = 0, + .baudrate = CONFIG_BAUDRATE, +}; + +U_BOOT_DEVICE(coldfire_serial) = { + .name = "serial_coldfire", + .platdata = &mcf5307_serial_plat, +}; diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index f169fd3..860ac7d 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -2,6 +2,10 @@ CONFIG_M68K=y CONFIG_TARGET_AMCORE=y CONFIG_SYS_TEXT_BASE=0xffc00000 CONFIG_SYS_PROMPT="amcore $ " +CONFIG_DM=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x800 # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_XIMG is not set CONFIG_LOOPW=y -- 2.7.0.rc3

2 1

[U-Boot] [PATCH 2/2] board: amcore: add update scripts
by Angelo Dureghello 19 May '16

19 May '16

Add some useful update scripts. Signed-off-by: Angelo Dureghello <angelo(a)sysam.it> --- include/configs/amcore.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/configs/amcore.h b/include/configs/amcore.h index e819185..9af2b11 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -1,7 +1,7 @@ /* * Sysam AMCORE board configuration * - * (C) Copyright 2015 Angelo Dureghello <angelo(a)sysam.it> + * (C) Copyright 2016 Angelo Dureghello <angelo(a)sysam.it> * * SPDX-License-Identifier: GPL-2.0+ */ @@ -20,6 +20,17 @@ #define CONFIG_BOOTDELAY 1 #define CONFIG_BOOTCOMMAND "bootm ffc20000" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "upgrade_uboot=loady; " \ + "protect off 0xffc00000 0xffc1ffff; " \ + "erase 0xffc00000 0xffc1ffff; " \ + "cp.b 0x20000 0xffc00000 ${filesize}\0" \ + "upgrade_kernel=loady; " \ + "erase 0xffc20000 0xffefffff; " \ + "cp.b 0x20000 0xffc20000 ${filesize}\0" \ + "upgrade_jffs2=loady; " \ + "erase0xfff00000 0xffffffff; " \ + "cp.b 0x20000 0xfff00000 ${filesize}\0" #undef CONFIG_CMD_AES #define CONFIG_CMD_DIAG -- 2.7.0.rc3

2 1

[U-Boot] [PATCH v3 0/3] dm: gpio: Add driver for MPC85xx GPIO controller
by Mario Six 19 May '16

19 May '16

The functions for accessing GPIOs on MPC85xx are hardcoded in arch/powerpc/include/asm/mpc85xx_gpio.h This leads to problems if another GPIO controller supporting the driver model is to be used simultaneously. Therefore, this patch moves the "static" functions into a DM-compatible driver, and also introduces a set of functions into the GPIO uclass that expose the controller's capability to switch individual GPIOs into open-drain-mode. v3 also implements shadowing of the GPDAT register to work around a known issue in some MPC85xx GPIO controllers (as pointed out by Joakim Tjernlund). mario.six(a)gdsys.cc (3): dm: gpio: Add driver for MPC85XX GPIO controller dm: gpio: Add methods for open drain setting dm: gpio: Implement open drain for MPC85XX GPIO arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 + arch/powerpc/include/asm/immap_85xx.h | 2 + drivers/gpio/Kconfig | 25 ++++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-uclass.c | 32 +++++ drivers/gpio/mpc85xx_gpio.c | 206 +++++++++++++++++++++++++++ include/asm-generic/gpio.h | 34 +++++ 7 files changed, 302 insertions(+) create mode 100644 drivers/gpio/mpc85xx_gpio.c -- 2.7.0.GIT

3 6