November 2018 - U-Boot

[U-Boot] [PATCH] mmc: Do not issue CMD 6 on SD 1.00 and SD 1.01
by Marek Vasut 18 Nov '18

18 Nov '18

According to SD Specifications Part 1 Physical Layer Simplified Specification Version 6.00 August 29, 2018, section 4.3.10 (Switch Function Command) and section 5.6 (SCR register), SD cards version 1.00 and 1.01 do not support the SD CMD 6. Currently, U-Boot will issue CMD 6 unconditionally in sd_set_card_speed() while configuring the bus for selected frequency. This will make SD cards version 1.00 and 1.01 time out and thus fail detection altogether. Fix this by not sending CMD 6 on such cards. Tested on Matsushita Electric Industrial Co., Ltd. Japan RP-SD008B / Victor 8MB SD card, CU-SD008, which is correctly detected with this patch as: Device: sd@ee160000 Manufacturer ID: 1 OEM: 5041 Name: S008B Bus Speed: 25000000 Mode : SD Legacy Rd Block Len: 512 SD version 1.0 High Capacity: No Capacity: 6.5 MiB Bus Width: 4-bit Erase Group Size: 512 Bytes Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/mmc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 585951cd78..8c06e7a16e 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -1289,6 +1289,10 @@ static int sd_set_card_speed(struct mmc *mmc, enum bus_mode mode) ALLOC_CACHE_ALIGN_BUFFER(uint, switch_status, 16); int speed; + /* SD version 1.00 and 1.01 does not support CMD 6 */ + if (mmc->version == SD_VERSION_1_0) + return 0; + switch (mode) { case SD_LEGACY: speed = UHS_SDR12_BUS_SPEED; -- 2.18.0

1 0

[U-Boot] mips-relocs tool conflicts with CONFIG_OF_SEPRATE
by 袁建鹏 17 Nov '18

17 Nov '18

Hi I'm adding a new board support to u-boot-2018.09. When I boot the device,I got an error msg: No valid device tree binary found - please append one to U-Boot binary, use u-boot-dtb.bin or define CONFIG_OF_EMBED. For sandbox, use -d <file.dtb> After some debugging, I found the reason: the device tree blob is cat to u-boot-nodtb.bin. the dtb is referenced by `_end` symbol which is defined at arch/mips/cpu/u-boot.lds /* * .rel must come last so that the mips-relocs tool can shrink * the section size & the PT_LOAD program header filesz. */ .rel : { __rel_start = .; BYTE(0x0) . += (32 * 1024) - 1; } _end = .; But mips-relocs tool shrink the .rel section, that make filesz smaller than memsz: Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align ABIFLAGS 0x02c2a8 0x8102c228 0x8102c228 0x00018 0x00018 R 0x8 LOAD 0x000080 0x81000000 0x81000000 0x30906 0x3638c RWE 0x10 the _end is 0x3638c, but the actual offset of dtb is changed to 0x30906. so we can't read the dtb correctly. I disable shrink then works fine. but a better solution is to change the _end symbol in u-boot elf accordingly. Best Regards.

2 1

[U-Boot] [PATCH] sunxi: Update MAINTAINERS file for recent boards
by Tom Rini 17 Nov '18

17 Nov '18

Add entries for the pine64-lts and pinebook configs. Cc: Vasily Khoruzhick <anarsoul(a)gmail.com> Cc: Andre Przywara <andre.przywara(a)arm.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- board/sunxi/MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 478e37285f12..9b6e0c4c21a2 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -380,10 +380,16 @@ M: Hauke Mehrtens <hauke(a)hauke-m.de> S: Maintained F: configs/orangepi_r1_defconfig +PINEBOOK BOARD: +M: Vasily Khoruzhick <anarsoul(a)gmail.com> +S: Maintained +F: configs/pinebook_defconfig + PINE64 BOARDS M: Andre Przywara <andre.przywara(a)arm.com> S: Maintained F: configs/pine64_plus_defconfig +F: configs/pine64-lts_defconfig PINE H64 BOARD M: Icenowy Zheng <icenowy(a)aosc.io> -- 2.7.4

1 1

[U-Boot] [PATCH] configs: Enable THUMB2 on various ARM boards
by Tom Rini 17 Nov '18

17 Nov '18

The clearfog, corvus, wb45n and picosam9g45 configs are close to exceeding their size limits, so enable THUMB2 builds on them to reclaim space. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/clearfog_defconfig | 1 + configs/corvus_defconfig | 1 + configs/picosam9g45_defconfig | 1 + configs/wb45n_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig index 9167a9450d76..2e59686291b7 100644 --- a/configs/clearfog_defconfig +++ b/configs/clearfog_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MVEBU=y CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_GPIO_SUPPORT=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index b1e7c35fa99e..a1af2f1342f5 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y # CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set CONFIG_ARCH_AT91=y diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig index be9cb5c71edd..699e2e230ab3 100644 --- a/configs/picosam9g45_defconfig +++ b/configs/picosam9g45_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x23f00000 CONFIG_TARGET_PICOSAM9G45=y diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig index 33591d73e0d1..9d881e5d41ab 100644 --- a/configs/wb45n_defconfig +++ b/configs/wb45n_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x23f00000 CONFIG_TARGET_WB45N=y -- 2.7.4

1 1

[U-Boot] [PATCH v1 0/6] Add support for DM_USB and DM_USB_DEV to TI's K2G platforms
by Jean-Jacques Hiblot 17 Nov '18

17 Nov '18

The K2G platforms can use the generic DWC3 driver instead of relying on the keystone-xhci driver. Benefits are: - moving toward DM - brings USB gadget for free - allows us to remove some code Tested on: - K2G EVM Jean-Jacques Hiblot (6): usb: dwc3-generic: make it compatible with "ti,keystone-dwc3" board: ks2_evm: Enable the USB clocks if DM_USB is used ARM: dts: k2g-evm: enable USB0 and USB1 PHY: Add phy driver for the keystone USB PHY usb: host: replace xhci-keystone driver by the generic dwc3 driver configs: k2g_evm: Enable DFU on K2G EVM arch/arm/dts/keystone-k2g-evm.dts | 28 ++++ arch/arm/dts/keystone-k2g.dtsi | 56 ++++++++ board/ti/ks2_evm/board.c | 12 ++ configs/k2e_evm_defconfig | 7 + configs/k2e_hs_evm_defconfig | 7 + configs/k2g_evm_defconfig | 12 ++ configs/k2g_hs_evm_defconfig | 12 ++ configs/k2hk_evm_defconfig | 7 + configs/k2hk_hs_evm_defconfig | 7 + configs/k2l_evm_defconfig | 7 + configs/k2l_hs_evm_defconfig | 7 + drivers/phy/Kconfig | 10 ++ drivers/phy/Makefile | 1 + drivers/phy/keystone-usb-phy.c | 109 ++++++++++++++++ drivers/usb/dwc3/dwc3-generic.c | 1 + drivers/usb/host/Makefile | 1 - drivers/usb/host/xhci-keystone.c | 240 ----------------------------------- include/configs/ti_armv7_keystone2.h | 17 ++- 18 files changed, 294 insertions(+), 247 deletions(-) create mode 100644 drivers/phy/keystone-usb-phy.c delete mode 100644 drivers/usb/host/xhci-keystone.c -- 2.7.4

2 13

[U-Boot] [PATCH 1/2] image-sig: Ensure that hashed-nodes is null-terminated
by Tom Rini 17 Nov '18

17 Nov '18

From: Konrad Beckmann <konrad.beckmann(a)gmail.com> A specially crafted FIT image leads to memory corruption in the stack when using the verified boot feature. The function fit_config_check_sig has a logic error that makes it possible to write past the end of the stack allocated array node_inc. This could potentially be used to bypass the signature check when using verified boot. This change ensures that the number of strings is correct when counted. Signed-off-by: Konrad Beckmann <konrad.beckmann(a)gmail.com> --- common/image-sig.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/image-sig.c b/common/image-sig.c index 5a269d3289bf..5d860e126637 100644 --- a/common/image-sig.c +++ b/common/image-sig.c @@ -334,6 +334,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode, return -1; } + if (prop && prop_len > 0 && prop[prop_len - 1] != '\0') { + *err_msgp = "hashed-nodes property must be null-terminated"; + return -1; + } + /* Add a sanity check here since we are using the stack */ if (count > IMAGE_MAX_HASHED_NODES) { *err_msgp = "Number of hashed nodes exceeds maximum"; -- 2.7.4

2 5

[U-Boot] [PATCH v3] Ability to modify distro boot filename
by Martyn Welch 17 Nov '18

17 Nov '18

Add in the ability to modify the distro boot filename. Whilst not immediately useful in normal usage, it allows an alternative configuration to be provided when other u-boot functionality is used, such as bootcount limit, to fallback to an alternative boot configuration. In this case we can follow the same boot path as for normal boot, just using an alternatively named configuration file. For example, by providing the following `altbootcmd` when bootcount is in use: altbootcmd=setenv boot_extlinx_conf extlinux-rollback.conf; \ run distro_bootcmd Signed-off-by: Martyn Welch <martyn.welch(a)collabora.co.uk> --- Changes in v3: - Moving path to config variable, rename `boot_syslinux_conf` Changes in v2: - Moving config variable from `boot_config` to `boot_extlinux_conf` include/config_distro_bootcmd.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 373fee78a9..5838eb3477 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -355,15 +355,16 @@ "boot_script_dhcp=boot.scr.uimg\0" \ BOOTENV_BOOT_TARGETS \ \ + "boot_syslinux_conf=extlinux/extlinux.conf\0" \ "boot_extlinux=" \ "sysboot ${devtype} ${devnum}:${distro_bootpart} any " \ - "${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \ + "${scriptaddr} ${prefix}${boot_syslinux_conf}\0" \ \ "scan_dev_for_extlinux=" \ "if test -e ${devtype} " \ "${devnum}:${distro_bootpart} " \ - "${prefix}extlinux/extlinux.conf; then " \ - "echo Found ${prefix}extlinux/extlinux.conf; " \ + "${prefix}${boot_syslinux_conf}; then " \ + "echo Found ${prefix}${boot_syslinux_conf}; " \ "run boot_extlinux; " \ "echo SCRIPT FAILED: continuing...; " \ "fi\0" \ -- 2.11.0

3 2

[U-Boot] [PATCH 1/3] fs: Makefile: Add fs.c under SPL as well as it is needed for fs_loader
by Keerthy 17 Nov '18

17 Nov '18

Add fs.c under SPL as well as it is needed for fs_loader Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- fs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/Makefile b/fs/Makefile index bad0c2c..b4ca1b3 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -8,7 +8,6 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/ obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/ else -obj-y += fs.o obj-$(CONFIG_FS_BTRFS) += btrfs/ obj-$(CONFIG_FS_CBFS) += cbfs/ @@ -22,4 +21,5 @@ obj-$(CONFIG_CMD_UBIFS) += ubifs/ obj-$(CONFIG_YAFFS2) += yaffs2/ obj-$(CONFIG_CMD_ZFS) += zfs/ endif +obj-y += fs.o obj-y += fs_internal.o -- 1.9.1

3 8

[U-Boot] [PATCH] serial: ns16550: add setconfig support
by Simon Goldschmidt 17 Nov '18

17 Nov '18

Add possibility to update the serial parity used. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- drivers/serial/ns16550.c | 43 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index f9041aa626..88b312d0be 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -148,10 +148,13 @@ int ns16550_calc_divisor(NS16550_t port, int clock, int baudrate) static void NS16550_setbrg(NS16550_t com_port, int baud_divisor) { - serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr); + /* to keep serial format, read lcr before writing BKSE */ + int lcr_val = serial_in(&com_port->lcr) & ~UART_LCR_BKSE; + + serial_out(UART_LCR_BKSE | lcr_val, &com_port->lcr); serial_out(baud_divisor & 0xff, &com_port->dll); serial_out((baud_divisor >> 8) & 0xff, &com_port->dlm); - serial_out(UART_LCRVAL, &com_port->lcr); + serial_out(lcr_val, &com_port->lcr); } void NS16550_init(NS16550_t com_port, int baud_divisor) @@ -181,6 +184,8 @@ void NS16550_init(NS16550_t com_port, int baud_divisor) serial_out(UART_MCRVAL, &com_port->mcr); serial_out(ns16550_getfcr(com_port), &com_port->fcr); + /* initialize serial config to 8N1 before writing baudrate */ + serial_out(UART_LCRVAL, &com_port->lcr); if (baud_divisor != -1) NS16550_setbrg(com_port, baud_divisor); #if defined(CONFIG_ARCH_OMAP2PLUS) || defined(CONFIG_SOC_DA8XX) || \ @@ -334,6 +339,39 @@ static int ns16550_serial_setbrg(struct udevice *dev, int baudrate) return 0; } +static int ns16550_serial_setconfig(struct udevice *dev, uint serial_config) +{ + struct NS16550 *const com_port = dev_get_priv(dev); + int lcr_val = UART_LCR_WLS_8; + uint parity = SERIAL_GET_PARITY(serial_config); + uint bits = SERIAL_GET_BITS(serial_config); + uint stop = SERIAL_GET_STOP(serial_config); + + /* + * only parity config is implemented, check if other serial settings + * are the default one. + */ + if (bits != SERIAL_8_BITS || stop != SERIAL_ONE_STOP) + return -ENOTSUPP; /* not supported in driver*/ + + switch (parity) { + case SERIAL_PAR_NONE: + /* no bits to add */ + break; + case SERIAL_PAR_ODD: + lcr_val |= UART_LCR_PEN; + break; + case SERIAL_PAR_EVEN: + lcr_val |= UART_LCR_PEN | UART_LCR_EPS; + break; + default: + return -ENOTSUPP; /* not supported in driver*/ + } + + serial_out(lcr_val, &com_port->lcr); + return 0; +} + int ns16550_serial_probe(struct udevice *dev) { struct NS16550 *const com_port = dev_get_priv(dev); @@ -440,6 +478,7 @@ const struct dm_serial_ops ns16550_serial_ops = { .pending = ns16550_serial_pending, .getc = ns16550_serial_getc, .setbrg = ns16550_serial_setbrg, + .setconfig = ns16550_serial_setconfig }; #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) -- 2.17.1

4 9

[U-Boot] [PATCH] dm: serial: fix comment on dm_serial_ops setconfig
by Simon Goldschmidt 17 Nov '18

17 Nov '18

The comment on this function prototype describes nonexistent parameters. It seems to be copied from 'setparity'. Update it to match its the parameter list. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- include/serial.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/serial.h b/include/serial.h index 020cd392e8..ec25db6e60 100644 --- a/include/serial.h +++ b/include/serial.h @@ -195,9 +195,7 @@ struct dm_serial_ops { * Set up a new config for this device. * * @dev: Device pointer - * @parity: parity to use - * @bits: bits number to use - * @stop: stop bits number to use + * @serial_config: number of bits, parity and number of stopbits to use * @return 0 if OK, -ve on error */ int (*setconfig)(struct udevice *dev, uint serial_config); -- 2.17.1

3 2