January 2018 - U-Boot

[U-Boot] [PATCH] env: sf: fix return value of env_sf_load
by Simon Goldschmidt 30 Jan '18

30 Jan '18

With the recent changes to support multiple environments, I see a message "Failed (1)" when loading environment from sf. env_sf_load() returns the return value of env_import(). This must be 'inverted' to return the correct meaning. Signed-off-by: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> --- env/sf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/env/sf.c b/env/sf.c index a2e4c93631..921860fd88 100644 --- a/env/sf.c +++ b/env/sf.c @@ -239,6 +239,9 @@ static int env_sf_load(void) if (!ret) { pr_err("Cannot import environment: errno = %d\n", errno); set_default_env("!env_import failed"); + ret = -EIO; + } else { + ret = 0; } err_read: @@ -336,8 +339,12 @@ static int env_sf_load(void) } ret = env_import(buf, 1); - if (ret) + if (ret) { gd->env_valid = ENV_VALID; + ret = 0; + } else { + ret = -EIO; + } err_read: spi_flash_free(env_flash); -- 2.11.0

2 2

[U-Boot] [PATCH] armv8: ls1088: Add USB and PCI configs in SD-BOOT defconfig
by Ashish Kumar 30 Jan '18

30 Jan '18

Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- depends on: https://patchwork.ozlabs.org/patch/853615/ Tested on 2018.01-rc3 configs/ls1088aqds_sdcard_qspi_defconfig | 12 ++++++++++++ configs/ls1088ardb_sdcard_qspi_defconfig | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig index 0ba6981..659bc4f 100644 --- a/configs/ls1088aqds_sdcard_qspi_defconfig +++ b/configs/ls1088aqds_sdcard_qspi_defconfig @@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_DHCP=y CONFIG_CMD_PING=y @@ -35,6 +36,17 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig index 77e6f0a..2e3c287 100644 --- a/configs/ls1088ardb_sdcard_qspi_defconfig +++ b/configs/ls1088ardb_sdcard_qspi_defconfig @@ -24,6 +24,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y +CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y @@ -34,6 +35,17 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y -- 2.7.4

3 11

[U-Boot] [PATCH] x86: kconfig: Remove meaningless 'select n'
by Ulf Magnusson 30 Jan '18

30 Jan '18

'select n' selects a constant symbol, which is meaningless and has no effect. Maybe this was meant to be a 'default n', though bool and tristate symbols already implicitly default to n. Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib), which does more strict checking here: kconfiglib.KconfigSyntaxError: board/google/Kconfig:34: Couldn't parse ' select n': expected nonconstant symbol Signed-off-by: Ulf Magnusson <ulfalizer(a)gmail.com> --- board/google/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/board/google/Kconfig b/board/google/Kconfig index e56c026ef6..766db1b449 100644 --- a/board/google/Kconfig +++ b/board/google/Kconfig @@ -31,7 +31,6 @@ config TARGET_CHROMEBOOK_LINK64 config TARGET_CHROMEBOX_PANTHER bool "Chromebox panther (not available)" - select n help Note: At present this must be used with coreboot. See README.x86 for instructions. -- 2.14.1

2 2

[U-Boot] [PATCH] arm64: zynqmp: Fix misspelled choice default
by Ulf Magnusson 30 Jan '18

30 Jan '18

There is no JTAG symbol in the "Boot mode" choice. JTAG_MODE was probably intended. No functional changes. Kconfig choices fall back on using the first (visible) symbol in the choice as the default if the default symbol is not visible. Discovered in Kconfiglib (https://github.com/ulfalizer/Kconfiglib), which prints the following warning: warning: the default selection JTAG (undefined) of <choice> (defined at arch/arm/cpu/armv8/zynqmp/Kconfig:107) is not contained in the choice I've added a corresponding warning to the C tools too, which is currently in linux-next: https://patchwork.kernel.org/patch/9983667/ Signed-off-by: Ulf Magnusson <ulfalizer(a)gmail.com> --- arch/arm/cpu/armv8/zynqmp/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig index 3f922b4097..56b7846f63 100644 --- a/arch/arm/cpu/armv8/zynqmp/Kconfig +++ b/arch/arm/cpu/armv8/zynqmp/Kconfig @@ -107,7 +107,7 @@ config SPL_ZYNQMP_ALT_BOOTMODE choice prompt "Boot mode" depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED - default JTAG + default JTAG_MODE config JTAG_MODE bool "JTAG_MODE" -- 2.14.1

2 5

[U-Boot] [PATCH v2 00/24] omap_hsmmc: Add support for HS200 and UHS modes
by Jean-Jacques Hiblot 30 Jan '18

30 Jan '18

This series adds the missing bits to enable the UHS and HS200 modes for the TI platforms. Enabling support for high speed modes on omap5 requires implementing: * io signal voltage selection * tuning support * pin configuration (IO delays) The few last patches enable the high speed modes for the DRA7 platforms and also take care of disabling those modes in the dts for the platforms that cannot support either the UHS or the HS200 because the voltage regulators on board would not allow using those modes (not a SOC limitation). With this in place we observe significant improvements in the performances: on a DRA72 evm: eMMC HS200: 124 MB/s eMMC DDR52: 78 MB/s sd SDR104: 71 MB/s sd SDR50: 44 MB/s For the record, the original performances were: SD High speed: 18 MB/s MMC High speed: 18 MB/s This series has been tested on: * DRA71-evm * DRA72-evm * DRA7x-evm * DRA76-evm * AM57x-evm * Beaglebone Black (dt and non-dt) changes since v1: - rebased on top of u-boot/master - enable the H200 and UHS support in the defconfigs of the DRA7 platforms Jean-Jacques Hiblot (9): mmc: omap_hsmmc: Reduce the max timeout for reset controller fsm mmc: omap_hsmmc: allow the simple HS modes to use the default pinctrl mmc: omap_hsmmc: update mmc->clock with the actual bus speed mmc: omap_hsmmc: implement send_init_stream callback mmc: omap_hsmmc: add signal voltage selection support ARM: dts: dra7: Add supported MMC/SD modes in MMC dt nodes dts: am57xx-beagle-x15: disable UHS and HS200 support dts: am57xx-idk: disable HS200 support configs: dra7xx_evm/dra7xx_hs_evm: Enable MMC HS200 and SD UHS support Kishon Vijay Abraham I (15): mmc: omap_hsmmc: cleanup clock configuration mmc: omap_hsmmc: cleanup omap_hsmmc_set_ios mmc: omap_hsmmc: add support to set default io voltage mmc: omap_hsmmc: set MMC mode in the UHSMS bit field mmc: omap_hsmmc: Enable DDR mode support mmc: omap_hsmmc: Add tuning support mmc: omap_hsmmc: Workaround for errata id i802 mmc: omap_hsmmc: use mmc_of_parse to populate mmc_config ARM: OMAP5/DRA7: Enable iodelay recalibration to be done from uboot mmc: omap_hsmmc: Add support to set IODELAY values mmc: omap_hsmmc: Add support to get pinctrl values and max frequency for different hw revisions mmc: omap_hsmmc: allow mmc clock to be gated ARM: OMAP5: set mmc clock frequency to 192MHz ARM: dts: DRA7: use new dra7-specific compatible string ARM: DRA7x/AM57x: Add MMC/SD fixups for rev1.0 and rev 1.1 arch/arm/dts/am57xx-beagle-x15.dts | 6 + arch/arm/dts/am57xx-idk-common.dtsi | 2 + arch/arm/dts/dra7.dtsi | 22 +- arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h | 3 + arch/arm/include/asm/arch-omap5/sys_proto.h | 7 + arch/arm/include/asm/omap_mmc.h | 59 +- arch/arm/mach-omap2/omap5/dra7xx_iodelay.c | 30 + arch/arm/mach-omap2/omap5/hw_data.c | 10 +- board/ti/am57xx/board.c | 30 + board/ti/dra7xx/evm.c | 29 + configs/dra7xx_evm_defconfig | 3 + configs/dra7xx_hs_evm_defconfig | 3 + drivers/mmc/omap_hsmmc.c | 948 +++++++++++++++++++++-- include/configs/am57xx_evm.h | 2 - include/configs/dra7xx_evm.h | 2 - 16 files changed, 1085 insertions(+), 73 deletions(-) -- 1.9.1

4 32

[U-Boot] [PATCH 1/4] mtd: nand: mxs_nand: use self init
by Stefan Agner 30 Jan '18

30 Jan '18

From: Stefan Agner <stefan.agner(a)toradex.com> Instead of completing initialization via scan_bbt callback use NAND self init to initialize the GPMI (MXS) NAND controller. Signed-off-by: Stefan Agner <stefan.agner(a)toradex.com> --- drivers/mtd/nand/Kconfig | 1 + drivers/mtd/nand/mxs_nand.c | 52 +++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 78a39abf75..1ca86925dc 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -140,6 +140,7 @@ config NAND_MXC config NAND_MXS bool "MXS NAND support" depends on MX6 || MX7 + select SYS_NAND_SELF_INIT imply CMD_NAND help This enables NAND driver for the NAND flash controller on the diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index bed9b65ef4..cf96584fa8 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -18,6 +18,7 @@ #include <linux/mtd/rawnand.h> #include <linux/types.h> #include <malloc.h> +#include <nand.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/arch/clock.h> @@ -47,6 +48,7 @@ #define MXS_NAND_BCH_TIMEOUT 10000 struct mxs_nand_info { + struct nand_chip chip; int cur_chip; uint32_t cmd_queue_len; @@ -972,20 +974,15 @@ static int mxs_nand_block_bad(struct mtd_info *mtd, loff_t ofs) } /* - * Nominally, the purpose of this function is to look for or create the bad - * block table. In fact, since the we call this function at the very end of - * the initialization process started by nand_scan(), and we doesn't have a - * more formal mechanism, we "hook" this function to continue init process. - * * At this point, the physical NAND Flash chips have been identified and * counted, so we know the physical geometry. This enables us to make some * important configuration decisions. * * The return value of this function propagates directly back to this driver's - * call to nand_scan(). Anything other than zero will cause this driver to + * board_nand_init(). Anything other than zero will cause this driver to * tear everything down and declare failure. */ -static int mxs_nand_scan_bbt(struct mtd_info *mtd) +static int mxs_nand_setup_ecc(struct mtd_info *mtd) { struct nand_chip *nand = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(nand); @@ -1047,8 +1044,7 @@ static int mxs_nand_scan_bbt(struct mtd_info *mtd) mtd->_block_markbad = mxs_nand_hook_block_markbad; } - /* We use the reference implementation for bad block management. */ - return nand_default_bbt(mtd); + return 0; } /* @@ -1150,27 +1146,22 @@ err1: return ret; } -/*! - * This function is called during the driver binding process. - * - * @param pdev the device structure used to store device specific - * information that is used by the suspend, resume and - * remove functions - * - * @return The function always returns 0. - */ -int board_nand_init(struct nand_chip *nand) +void board_nand_init(void) { + struct mtd_info *mtd; struct mxs_nand_info *nand_info; + struct nand_chip *nand; int err; nand_info = malloc(sizeof(struct mxs_nand_info)); if (!nand_info) { printf("MXS NAND: Failed to allocate private data\n"); - return -ENOMEM; + return; } memset(nand_info, 0, sizeof(struct mxs_nand_info)); + nand = &nand_info->chip; + mtd = nand_to_mtd(nand); err = mxs_nand_alloc_buffers(nand_info); if (err) goto err1; @@ -1189,13 +1180,19 @@ int board_nand_init(struct nand_chip *nand) nand->dev_ready = mxs_nand_device_ready; nand->select_chip = mxs_nand_select_chip; nand->block_bad = mxs_nand_block_bad; - nand->scan_bbt = mxs_nand_scan_bbt; nand->read_byte = mxs_nand_read_byte; nand->read_buf = mxs_nand_read_buf; nand->write_buf = mxs_nand_write_buf; + /* first scan to find the device and get the page size */ + if (nand_scan_ident(mtd, CONFIG_SYS_MAX_NAND_DEVICE, NULL)) + goto err2; + + if (mxs_nand_setup_ecc(mtd)) + goto err2; + nand->ecc.read_page = mxs_nand_ecc_read_page; nand->ecc.write_page = mxs_nand_ecc_write_page; nand->ecc.read_oob = mxs_nand_ecc_read_oob; @@ -1207,12 +1204,21 @@ int board_nand_init(struct nand_chip *nand) nand->ecc.size = 512; nand->ecc.strength = 8; - return 0; + /* second phase scan */ + err = nand_scan_tail(mtd); + if (err) + goto err2; + + err = nand_register(0, mtd); + if (err) + goto err2; + + return; err2: free(nand_info->data_buf); free(nand_info->cmd_buf); err1: free(nand_info); - return err; + return; } -- 2.16.1

2 4

[U-Boot] [PATCH] board: stm32: Fix stm32f746-disco boot
by patrice.chotard＠st.com 30 Jan '18

30 Jan '18

From: Patrice Chotard <patrice.chotard(a)st.com> Since 'commit af2f44267 ("fdc spl: use different BOARD_INIT MACRO for spl and tpl")' board stm32f746-disco can't boot. The macro CONFIG_IS_ENABLED() can't evaluate the value of CONFIG_SPL_BOARD_INIT as it was defined in include/configs/stm32f746-disco.h without attributed value. Moving CONFIG_SPL_BOARD_INIT from stm32f746-disco.h to mach-stm32/Kconfig fixes this issue. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- arch/arm/mach-stm32/Kconfig | 1 + include/configs/stm32f746-disco.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig index 5f7a2b5669ea..f79b1a2c700e 100644 --- a/arch/arm/mach-stm32/Kconfig +++ b/arch/arm/mach-stm32/Kconfig @@ -29,6 +29,7 @@ config STM32F7 select STM32_SERIAL select SUPPORT_SPL select SPL + select SPL_BOARD_INIT select SPL_CLK select SPL_DM select SPL_DM_SEQ_ALIAS diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 301ab0f8f211..3e952c2acd82 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -72,7 +72,6 @@ #ifdef CONFIG_SUPPORT_SPL #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_SPL_LEN 0x00008000 -- 1.9.1

3 2

[U-Boot] Raspberry Pi USB storage broken after 64 byte device descriptor patch
by Kristian Amlie 30 Jan '18

30 Jan '18

I have a recent problem with USB storage on the Raspberry Pi 3 with U-Boot. Take a look at the output from v2017.01: ------ USB0: Core Release: 2.80a scanning bus 0 for devices... 4 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found scanning usb for ethernet devices... 1 Ethernet Device(s) found Hit any key to stop autoboot: 0 U-Boot> ------ which is the correct output. And compare to v2018.01: ------ USB0: Core Release: 2.80a scanning bus 0 for devices... unable to get device descriptor(error=-110) 3 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 U-Boot> ------ I'm unable to use USB storage afterwards, such as "ls usb 0". I have bisected the commits and found that the problem was introduced in the commit below. I am not familiar enough with USB internals to comment on the correctness of the commit, but apparently it's not working entirely as expected. Maybe the original author can comment? ------ commit c008faa77358bb5b313696dd1d5bb8afa03a6ca2 Author: Bin Meng <bmeng.cn(a)gmail.com> Date: Mon Sep 18 15:40:42 2017 usb: Only get 64 bytes device descriptor for full speed devices Full speed device endpoint 0 can have 8/16/32/64 bMaxPacketSize0. Other speed devices report fixed value per USB spec. So it only makes sense if we send a get device descriptor with 64 bytes to full speed devices. While we are here, update the comment block to be within 80 cols. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> ------ -- Kristian

1 0

[U-Boot] [PATCH] x86: quark: Fix unused warnings
by Tom Rini 30 Jan '18

30 Jan '18

The variable t_rfc is never used, so drop it. The variables ddr_wctl and ddr_wcmd are only used in certain manual instances, so guard their declaration by the same check as their use. Cc: Bin Meng <bmeng.cn(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/x86/cpu/quark/smc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/x86/cpu/quark/smc.c b/arch/x86/cpu/quark/smc.c index 3ffe92b67b20..0195b56a52f6 100644 --- a/arch/x86/cpu/quark/smc.c +++ b/arch/x86/cpu/quark/smc.c @@ -17,15 +17,6 @@ #include "hte.h" #include "smc.h" -/* t_rfc values (in picoseconds) per density */ -static const uint32_t t_rfc[5] = { - 90000, /* 512Mb */ - 110000, /* 1Gb */ - 160000, /* 2Gb */ - 300000, /* 4Gb */ - 350000, /* 8Gb */ -}; - /* t_ck clock period in picoseconds per speed index 800, 1066, 1333 */ static const uint32_t t_ck[3] = { 2500, @@ -35,8 +26,12 @@ static const uint32_t t_ck[3] = { /* Global variables */ static const uint16_t ddr_wclk[] = {193, 158}; +#ifdef BACKUP_WCTL static const uint16_t ddr_wctl[] = {1, 217}; +#endif +#ifdef BACKUP_WCMD static const uint16_t ddr_wcmd[] = {1, 220}; +#endif #ifdef BACKUP_RCVN static const uint16_t ddr_rcvn[] = {129, 498}; -- 2.7.4

2 2

[U-Boot] [PATCH 1/1] cmd/bdinfo: print relocation info on X86
by Heinrich Schuchardt 30 Jan '18

30 Jan '18

For debugging U-Boot in qemu-x86 the relocation address is needed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- Hello Bin, hello Simon, could this be picked up via the X86 tree? Best regards Heinrich --- cmd/bdinfo.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index c7ebad17d1..de6fc48987 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -377,6 +377,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) print_bi_dram(bd); + print_num("relocaddr", gd->relocaddr); + print_num("reloc off", gd->reloc_off); #if defined(CONFIG_CMD_NET) print_eth_ip_addr(); print_mhz("ethspeed", bd->bi_ethspeed); -- 2.14.2

2 2