May 2017 - U-Boot

[U-Boot] [PATCH 1/1] env: correct sign for error code
by Heinrich Schuchardt 12 May '17

12 May '17

Error codes should be negative. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/env_attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/env_attr.c b/common/env_attr.c index 5bfe5e3a89..386219087b 100644 --- a/common/env_attr.c +++ b/common/env_attr.c @@ -153,7 +153,7 @@ static int regex_callback(const char *name, const char *attributes, void *priv) } } else { printf("Error compiling regex: %s\n", slre.err_str); - retval = EINVAL; + retval = -EINVAL; } done: return retval; -- 2.11.0

2 1

[U-Boot] [PATCH 1/2] arm: omap5+: Add support for early debug
by Lokesh Vutla 12 May '17

12 May '17

For early debug, the following configs needs to be enabled: CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART_OMAP=y CONFIG_DEBUG_UART_CLOCK=48000000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_ANNOUNCE=y For DRA7xx: CONFIG_DEBUG_UART_BASE=0x4806a000 For AM57xx: CONFIG_DEBUG_UART_BASE=0x48020000 Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - Depends on DEBUG_UART_OMAP support patch[1] - Explicitly did not enable all the above configs by default as early debug is not need on every boot. arch/arm/mach-omap2/hwinit-common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/hwinit-common.c b/arch/arm/mach-omap2/hwinit-common.c index f317293988..eb310be392 100644 --- a/arch/arm/mach-omap2/hwinit-common.c +++ b/arch/arm/mach-omap2/hwinit-common.c @@ -12,6 +12,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> +#include <debug_uart.h> #include <spl.h> #include <asm/arch/sys_proto.h> #include <linux/sizes.h> @@ -159,6 +160,9 @@ void early_system_init(void) setup_early_clocks(); do_board_detect(); vcores_init(); +#ifdef CONFIG_DEBUG_UART_OMAP + debug_uart_init(); +#endif prcm_init(); } -- 2.11.0

2 5

[U-Boot] [PATCH 0/4] armv7m: add memory protection unit support
by Vikas Manocha 12 May '17

12 May '17

This patchset adds memory protection unit support(MPU) support & configures it for stm32f4 & stm32f7. Vikas Manocha (4): armv7m: correct mpu region size define for 8MB size armv7m: add MPU configuration support stm32: use armv7m MPU configuration support stm32f7: configure mpu valid for f7 family arch/arm/cpu/armv7m/Makefile | 2 +- arch/arm/cpu/armv7m/mpu.c | 82 +++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/armv7m.h | 19 --------- arch/arm/include/asm/armv7m_mpu.h | 67 ++++++++++++++++++++++++++++++++ arch/arm/mach-stm32/stm32f4/soc.c | 16 ++++---- arch/arm/mach-stm32/stm32f7/soc.c | 63 ++++++++---------------------- 6 files changed, 176 insertions(+), 73 deletions(-) create mode 100644 arch/arm/cpu/armv7m/mpu.c create mode 100644 arch/arm/include/asm/armv7m_mpu.h -- 1.9.1

2 8

[U-Boot] [PATCH v2 0/6] arm: am335x: Enable SPL_DM
by Lokesh Vutla 12 May '17

12 May '17

Enable SPL_DM on all AM335x based TI platforms. Using board-data way instead of using DT as suggested by Tom here[1], mainly due to space constraints. This series depends on Adam Ford's patch[2]. Link to travis-ci build tests: https://travis-ci.org/lokeshvutla/u-boot/builds/225872244 [1] https://www.mail-archive.com/u-boot@lists.denx.de/msg238483.html [2] http://patchwork.ozlabs.org/patch/751300/ Lokesh Vutla (6): dm: mmc: omap_hsmmc: Update to support of-platdata dm: mmc: omap_hsmmc: Add pre-reloc flag to the driver configs: am335x_evm: Use omap2 generic spl load script am33xx: Provide platform data for mmc configs: am335x_evm: Enable SPL_DM arm: am335x: Enable tiny printf in SPL arch/arm/Kconfig | 1 + arch/arm/include/asm/omap_mmc.h | 9 +++++ arch/arm/mach-omap2/am33xx/Kconfig | 5 +++ arch/arm/mach-omap2/am33xx/u-boot-spl.lds | 56 ------------------------------- board/ti/am335x/board.c | 32 ++++++++++++++++++ drivers/mmc/omap_hsmmc.c | 25 ++++++++------ include/configs/am335x_evm.h | 3 +- include/configs/am335x_igep0033.h | 2 +- include/configs/am335x_shc.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bav335x.h | 2 +- include/configs/bur_am335x_common.h | 2 +- include/configs/chiliboard.h | 2 +- include/configs/cm_t335.h | 2 +- include/configs/pcm051.h | 2 +- include/configs/pengwyn.h | 2 +- include/configs/pepper.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/ti_am335x_common.h | 2 ++ 20 files changed, 77 insertions(+), 80 deletions(-) delete mode 100644 arch/arm/mach-omap2/am33xx/u-boot-spl.lds -- 2.11.0

3 20

[U-Boot] [RFC PATCH] serial: omap: Support debug UART
by Lokesh Vutla 12 May '17

12 May '17

Add debug UART functions to permit omap specific ns16550 to provide an early debug UART. This is mostly in common with DEBUG_UART_NS16550 except for Mode definition register which is required for selecting UART mode(16x auto-baud or 13x mode). Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - I understand it is duplication of code, but I guess the idea is not to use NS16550_init() as it has lot of ifdefs. Please advice if this can be improved. drivers/serial/Kconfig | 7 +++++++ drivers/serial/ns16550.c | 47 ++++++++++++++++++++++++++++++++++++----------- include/debug_uart.h | 11 +++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index c0ec2ec2e4..5db9ec744e 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -238,6 +238,13 @@ config DEBUG_UART_UNIPHIER driver will be available until the real driver-model serial is running. +config DEBUG_UART_OMAP + bool "OMAP uart" + help + Select this to enable a debug UART using the omap ns16550 driver. + You will need to provide parameters to make this work. The driver + will be available until the real driver model serial is running. + endchoice config DEBUG_UART_BASE diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 4f86780cb1..ca55df78b7 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -246,17 +246,6 @@ int NS16550_tstc(NS16550_t com_port) #include <debug_uart.h> -#define serial_dout(reg, value) \ - serial_out_shift((char *)com_port + \ - ((char *)reg - (char *)com_port) * \ - (1 << CONFIG_DEBUG_UART_SHIFT), \ - CONFIG_DEBUG_UART_SHIFT, value) -#define serial_din(reg) \ - serial_in_shift((char *)com_port + \ - ((char *)reg - (char *)com_port) * \ - (1 << CONFIG_DEBUG_UART_SHIFT), \ - CONFIG_DEBUG_UART_SHIFT) - static inline void _debug_uart_init(void) { struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; @@ -293,6 +282,42 @@ DEBUG_UART_FUNCS #endif +#ifdef CONFIG_DEBUG_UART_OMAP + +#include <debug_uart.h> + +static inline void _debug_uart_init(void) +{ + struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; + int baud_divisor; + + baud_divisor = ns16550_calc_divisor(com_port, CONFIG_DEBUG_UART_CLOCK, + CONFIG_BAUDRATE); + serial_dout(&com_port->ier, CONFIG_SYS_NS16550_IER); + serial_dout(&com_port->mdr1, 0x7); + serial_dout(&com_port->mcr, UART_MCRVAL); + serial_dout(&com_port->fcr, UART_FCR_DEFVAL); + + serial_dout(&com_port->lcr, UART_LCR_BKSE | UART_LCRVAL); + serial_dout(&com_port->dll, baud_divisor & 0xff); + serial_dout(&com_port->dlm, (baud_divisor >> 8) & 0xff); + serial_dout(&com_port->lcr, UART_LCRVAL); + serial_dout(&com_port->mdr1, 0x0); +} + +static inline void _debug_uart_putc(int ch) +{ + struct NS16550 *com_port = (struct NS16550 *)CONFIG_DEBUG_UART_BASE; + + while (!(serial_din(&com_port->lsr) & UART_LSR_THRE)) + ; + serial_dout(&com_port->thr, ch); +} + +DEBUG_UART_FUNCS + +#endif + #ifdef CONFIG_DM_SERIAL static int ns16550_serial_putc(struct udevice *dev, const char ch) { diff --git a/include/debug_uart.h b/include/debug_uart.h index 2980ae6200..6f0b0c5e15 100644 --- a/include/debug_uart.h +++ b/include/debug_uart.h @@ -111,6 +111,17 @@ void printhex8(uint value); #define _DEBUG_UART_ANNOUNCE #endif +#define serial_dout(reg, value) \ + serial_out_shift((char *)com_port + \ + ((char *)reg - (char *)com_port) * \ + (1 << CONFIG_DEBUG_UART_SHIFT), \ + CONFIG_DEBUG_UART_SHIFT, value) +#define serial_din(reg) \ + serial_in_shift((char *)com_port + \ + ((char *)reg - (char *)com_port) * \ + (1 << CONFIG_DEBUG_UART_SHIFT), \ + CONFIG_DEBUG_UART_SHIFT) + /* * Now define some functions - this should be inserted into the serial driver */ -- 2.11.0

3 3

[U-Boot] [PATCH v3] Add 16-bit single register pin controller support
by James Balean 12 May '17

12 May '17

Enables the pinctrl-single driver to support 16-bit registers. Only 32-bit registers were supported previously. Reduced width registers are required for some platforms, such as OMAP. Signed-off-by: James Balean <james(a)balean.com.au> Cc: Felix Brack <fb(a)ltec.ch> Cc: Simon Glass <sjg(a)chromium.org> --- Changes for v3: - Fixes incorrect v2 submission. - Inline rather than separate read/write function calls. drivers/pinctrl/pinctrl-single.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index d2dcec0..f19f779 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -47,27 +47,27 @@ static int single_configure_pins(struct udevice *dev, int n, reg; u32 val; - for (n = 0; n < count; n++) { + for (n = 0; n < count; n++, pins++) { reg = fdt32_to_cpu(pins->reg); if ((reg < 0) || (reg > pdata->offset)) { dev_dbg(dev, " invalid register offset 0x%08x\n", reg); - pins++; continue; } reg += pdata->base; + val = fdt32_to_cpu(pins->val) & pdata->mask; switch (pdata->width) { + case 16: + writew((readw(reg) & ~pdata->mask) | val, reg); + break; case 32: - val = readl(reg) & ~pdata->mask; - val |= fdt32_to_cpu(pins->val) & pdata->mask; - writel(val, reg); - dev_dbg(dev, " reg/val 0x%08x/0x%08x\n", - reg, val); + writel((readl(reg) & ~pdata->mask) | val, reg); break; default: dev_warn(dev, "unsupported register width %i\n", pdata->width); + continue; } - pins++; + dev_dbg(dev, " reg/val 0x%08x/0x%08x\n",reg, val); } return 0; } -- 2.7.4

4 3

[U-Boot] [PATCH 1/3] spl: spi: override CONFIG_SYS_SPI_U_BOOT_OFFS via /config-property
by Philipp Tomsich 12 May '17

12 May '17

For the RK3399-Q7, we need some flexibility (depending on the feature set we include in the SPL stage and how large our SPI flash is) in positioning the SPL payload (i.e. the FIT image containing U-Boot, ATF and the M0 payload) in our SPI flash. To avoid having to deal with this through different U-Boot images, we introduce a the '/config/u-boot,spl-payload-offset' property node allow it to override the default setting. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/spl/spl_spi.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 925a1b1..42880d5 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -15,6 +15,8 @@ #include <errno.h> #include <spl.h> +DECLARE_GLOBAL_DATA_PTR; + #ifdef CONFIG_SPL_OS_BOOT /* * Load the kernel, check for a valid header we can parse, and if found load @@ -70,6 +72,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { int err = 0; + unsigned payload_offs = CONFIG_SYS_SPI_U_BOOT_OFFS; struct spi_flash *flash; struct image_header *header; @@ -89,12 +92,18 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, /* use CONFIG_SYS_TEXT_BASE as temporary storage area */ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) + payload_offs = fdtdec_get_config_int(gd->fdt_blob, + "u-boot,spl-payload-offset", + payload_offs); +#endif + #ifdef CONFIG_SPL_OS_BOOT if (spl_start_uboot() || spi_load_image_os(spl_image, flash, header)) #endif { /* Load u-boot, mkimage header is 64 bytes. */ - err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40, + err = spi_flash_read(flash, payload_offs, 0x40, (void *)header); if (err) { debug("%s: Failed to read from SPI flash (err=%d)\n", @@ -113,13 +122,13 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, load.bl_len = 1; load.read = spl_spi_fit_read; err = spl_load_simple_fit(spl_image, &load, - CONFIG_SYS_SPI_U_BOOT_OFFS, + payload_offs, header); } else { err = spl_parse_image_header(spl_image, header); if (err) return err; - err = spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, + err = spi_flash_read(flash, payload_offs, spl_image->size, (void *)spl_image->load_addr); } -- 1.9.1

4 9

[U-Boot] [PATCH 1/2] arm: Correct signature for get_ticks()
by Simon Glass 12 May '17

12 May '17

This should be uint64_t to match its definition in common.h. Fix it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/arm/cpu/armv8/generic_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/generic_timer.c b/arch/arm/cpu/armv8/generic_timer.c index cd92b2c761..a2dda333fe 100644 --- a/arch/arm/cpu/armv8/generic_timer.c +++ b/arch/arm/cpu/armv8/generic_timer.c @@ -43,7 +43,7 @@ unsigned long timer_read_counter(void) return cntpct; } -unsigned long long get_ticks(void) +uint64_t get_ticks(void) { unsigned long ticks = timer_read_counter(); -- 2.12.2.715.g7642488e1d-goog

3 4

[U-Boot] [PATCH 0/6] Android A/B Bootloader support
by Alex Deymo 12 May '17

12 May '17

An "Android Bootloader" has a lot of requirements about how it should behave which Android partners must implement. In particular, the new A/B updates [1] added more requirements and flows to the bootloader which are not common, on top of the existing flows. For example, a few uncommon requirements include: * Lookup in the BCB (boot control block) whether a "recovery" message is stored. This is used by the recovery environment when applying a multi-stage update in the legacy update model (recovery reboots to recovery again) and for interrumpted factory-reset (a reboot during the factory reset should continue to reboot into factory reset until it is done). * A new "repair" mode. In the A/B model, when none of the slots is bootable, the device would boot into repair mode, which is often the same as "bootloader" mode (fastboot). * Recovery as root: In newer version of AOSP, it is possible to mount the system image as / without an initramfs, which then frees up the initramfs in the "boot" partition to hold the "recovery" initramfs. This is the default for new devices and required for the A/B setup. This patchset updates the Android-related headers and introduces new commands to boot a recent Android build. This work is based on the bootloader used in the Raspberry Pi in Android Things and extensively tested there. [1] https://source.android.com/devices/tech/ota/ab_updates.html Alex Deymo (6): image: Update include/android_image.h image: Implement a function to load Android Images. cmd: Add 'load_android' command to load Android images. disk: Return the partition number in part_get_info_by_name() Initial support for the Android Bootloader flow cmd: Add "boot_android" command. README | 25 ++- cmd/Kconfig | 19 ++ cmd/Makefile | 2 + cmd/boot_android.c | 126 +++++++++++++ cmd/load_android.c | 56 ++++++ common/Kconfig | 19 ++ common/Makefile | 1 + common/android_bootloader.c | 350 +++++++++++++++++++++++++++++++++++ common/fb_mmc.c | 6 +- common/image-android.c | 60 ++++++ disk/part.c | 2 +- include/android_bootloader.h | 48 +++++ include/android_bootloader_message.h | 174 +++++++++++++++++ include/android_image.h | 24 ++- include/image.h | 19 ++ include/part.h | 3 +- 16 files changed, 920 insertions(+), 14 deletions(-) create mode 100644 cmd/boot_android.c create mode 100644 cmd/load_android.c create mode 100644 common/android_bootloader.c create mode 100644 include/android_bootloader.h create mode 100644 include/android_bootloader_message.h -- 2.12.2.564.g063fe858b8-goog

5 15

[U-Boot] [PATCH 0/2] usb: Extend ehci and ohci generic drivers
by patrice.chotard＠st.com 12 May '17

12 May '17

From: Patrice Chotard <patrice.chotard(a)st.com> Add generic PHY framework support to ehci-generic.c Add RESET, CLOCK and generic PHY frameworks support to ohci-generic.c Patrice Chotard (2): usb: extend generic EHCI driver with PHY usb: extend generic OHCI with CLOCK, RESET and PHY drivers/usb/host/ehci-generic.c | 11 +++++++++-- drivers/usb/host/ohci-generic.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 43 insertions(+), 8 deletions(-) -- 1.9.1

3 6