November 2018 - U-Boot

[U-Boot] [PATCH] board: ti: ks2_evm: Over ride spl_get_load_buffer function
by Keerthy 07 Dec '18

07 Dec '18

Currently k2 spi boot is broken as the image header is getting copied to an invalid memory location CONFIG_SYS_TEXT_BASE - sizeof (struct image_size) which maps to 0xc000000 - 0x40 = 0xbffffc0 being a reserved location. We cannot change the CONFIG_SYS_TEXT_BASE address as the single stage boots like UART boot will need the address to be 0xc000000 hence override the spl_get_load_buffer to have image_header address as CONFIG_SYS_TEXT_BASE aka 0xc000000 Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- Boot tetsed on K2G and K2E evms for UART, MMC and SPI modes. board/ti/ks2_evm/board.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/ti/ks2_evm/board.c b/board/ti/ks2_evm/board.c index 72709c0..3e06800 100644 --- a/board/ti/ks2_evm/board.c +++ b/board/ti/ks2_evm/board.c @@ -59,6 +59,11 @@ int dram_init(void) return 0; } +struct image_header *spl_get_load_buffer(ssize_t offset, size_t size) +{ + return (struct image_header *)(CONFIG_SYS_TEXT_BASE); +} + int board_init(void) { gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; -- 1.9.1

2 2

[U-Boot] [PATCH] clk: Allow clock defaults to be set during re-reloc state for SPL only
by Philipp Tomsich 07 Dec '18

07 Dec '18

In commit e5e06b65ad65 ("clk: Allow clock defaults to be set also during re-reloc state") the earlier guard against setting clock defaults in pre-reloc state was removed. While it is easy to filter 'assigned-clocks' properties for SPL using CONFIG_OF_SPL_REMOVE_PROPS, no such mechanism exists for the pre-reloc stage of the full U-Boot. With the default defconfig for the RK3399-Q7 (which filter the 'assigned-clocks' property for the DTS used by SPL anyway), this caused a pause during startup of the full U-Boot stage that lasted for almost 10s (due to the CPU not having been clocked up yet). This reintroduces the guard from commit f4fcba5c5baa ("clk: Allow clock defaults to be set also during re-reloc state") and extends it to only apply outside of a TPL/SPL build: i.e. clk_set_defaults will now run in pre-reloc state for SPL, but only after reloc for the full U-Boot. References: commit f4fcba5c5baa ("clk: implement clk_set_defaults()") References: commit e5e06b65ad65 ("clk: Allow clock defaults to be set also during re-reloc state") Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/clk/clk-uclass.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 04b369a..6d7a514 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -243,6 +243,10 @@ int clk_set_defaults(struct udevice *dev) { int ret; + /* If this not in SPL and pre-reloc state, don't take any action. */ + if (!(IS_ENABLED(CONFIG_SPL_BUILD) || (gd->flags & GD_FLG_RELOC))) + return 0; + debug("%s(%s)\n", __func__, dev_read_name(dev)); ret = clk_set_default_parents(dev); -- 2.1.4

2 1

[U-Boot] [PATCH] fs: fix FAT name extraction
by Patrick Wildt 07 Dec '18

07 Dec '18

The long name apparently can be accumulated using multiple 13-byte slots. Unfortunately we never checked how many we can actually fit in the buffer we are reading to. Signed-off-by: Patrick Wildt <patrick(a)blueri.se> --- fs/fat/fat.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 4bc3030ab88..cadf3d039f0 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -810,6 +810,9 @@ static dir_entry *extract_vfat_name(fat_itr *itr) slot2str((dir_slot *)dent, buf, &idx); + if (n + idx >= sizeof(itr->l_name)) + return NULL; + /* shift accumulated long-name up and copy new part in: */ memmove(itr->l_name + idx, itr->l_name, n); memcpy(itr->l_name, buf, idx); -- 2.17.2 (Apple Git-113)

2 1

[U-Boot] [PATCH] fs: check FAT cluster size
by Patrick Wildt 07 Dec '18

07 Dec '18

The cluster size specifies how many sectors make up a cluster. A cluster size of zero makes no sense, as it would mean that the cluster is made up of no sectors. This will later lead into a division by zero in sect_to_clust(), so better take care of that early. The MAX_CLUSTSIZE define can reduced using a define to make some room in low-memory system. Unfortunately if the code reads a filesystem with a bigger cluster size it will overflow the buffer. Signed-off-by: Patrick Wildt <patrick(a)blueri.se> --- fs/fat/fat.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index cadf3d039f0..ac8913e7192 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -571,6 +571,17 @@ static int get_fs_info(fsdata *mydata) mydata->sect_size, cur_part_info.blksz); return -1; } + if (mydata->clust_size == 0) { + printf("Error: FAT cluster size not set\n"); + return -1; + } + if ((unsigned int)mydata->clust_size * mydata->sect_size > + MAX_CLUSTSIZE) { + printf("Error: FAT cluster size too big (cs=%u, max=%u)\n", + (unsigned int)mydata->clust_size * mydata->sect_size, + MAX_CLUSTSIZE); + return -1; + } if (mydata->fatsize == 32) { mydata->data_begin = mydata->rootdir_sect - -- 2.17.2 (Apple Git-113)

2 1

[U-Boot] [PATCH] configs: stm32f746-disco: Fix stm32f746-disco boot
by Patrice Chotard 07 Dec '18

07 Dec '18

Since commit 8f651ca60ba1 ("pinctrl: stm32: Add get_pins_count() ops") stm32f746-disco can't boot. This is due to new memory allocation into STM32 pinctrl driver, increase SYS_MALLOC_F_LEN from 0xC00 to 0xE00. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- configs/stm32f746-disco_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig index 1bf3a7c11fda..121e96280895 100644 --- a/configs/stm32f746-disco_defconfig +++ b/configs/stm32f746-disco_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_STM32=y CONFIG_SYS_TEXT_BASE=0x08008000 -CONFIG_SYS_MALLOC_F_LEN=0xC00 +CONFIG_SYS_MALLOC_F_LEN=0xE00 CONFIG_STM32F7=y CONFIG_TARGET_STM32F746_DISCO=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -- 1.9.1

2 1

[U-Boot] [PATCH] main: Drop more #ifdefs
by Simon Glass 07 Dec '18

07 Dec '18

Now that many things are converted to Kconfig we can drop most of the Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/main.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/common/main.c b/common/main.c index 9802bed229c..07b34bf2b05 100644 --- a/common/main.c +++ b/common/main.c @@ -24,15 +24,15 @@ static void run_preboot_environment_command(void) p = env_get("preboot"); if (p != NULL) { -# ifdef CONFIG_AUTOBOOT_KEYED - int prev = disable_ctrlc(1); /* disable Control C checking */ -# endif + int prev = 0; + + if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED)) + prev = disable_ctrlc(1); /* disable Ctrl-C checking */ run_command_list(p, -1, 0); -# ifdef CONFIG_AUTOBOOT_KEYED - disable_ctrlc(prev); /* restore Control C checking */ -# endif + if (IS_ENABLED(CONFIG_AUTOBOOT_KEYED)) + disable_ctrlc(prev); /* restore Ctrl-C checking */ } #endif /* CONFIG_PREBOOT */ } @@ -44,17 +44,15 @@ void main_loop(void) bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop"); -#ifdef CONFIG_VERSION_VARIABLE - env_set("ver", version_string); /* set version variable */ -#endif /* CONFIG_VERSION_VARIABLE */ + if (IS_ENABLED(CONFIG_VERSION_VARIABLE)) + env_set("ver", version_string); /* set version variable */ cli_init(); run_preboot_environment_command(); -#if defined(CONFIG_UPDATE_TFTP) - update_tftp(0UL, NULL, NULL); -#endif /* CONFIG_UPDATE_TFTP */ + if (IS_ENABLED(CONFIG_UPDATE_TFTP)) + update_tftp(0UL, NULL, NULL); s = bootdelay_process(); if (cli_process_fdt(&s)) -- 2.20.0.rc0.387.gc7a69e6b6c-goog

2 1

[U-Boot] [PATCH] w1: fix occasional enumeration failure
by Martin Fuzzey 07 Dec '18

07 Dec '18

Sometimes enumeration fails (about 1 in 50 times on my custom board). The underlying reason is probably electrical but Linux does not have the problem. Comparing the Linux / u-boot implementations shows that Linux retries the error case whereas u-boot aborts early. Removing the early abort in u-boot fixes the problem. Signed-off-by: Martin Fuzzey <martin.fuzzey(a)flowbird.group> --- drivers/w1/w1-uclass.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/w1/w1-uclass.c b/drivers/w1/w1-uclass.c index 5544b19..ad86bf6 100644 --- a/drivers/w1/w1-uclass.c +++ b/drivers/w1/w1-uclass.c @@ -84,10 +84,6 @@ static int w1_enumerate(struct udevice *bus) rn |= (tmp64 << i); } - /* last device or error, aborting here */ - if ((triplet_ret & 0x03) == 0x03) - last_device = true; - if ((triplet_ret & 0x03) != 0x03) { if (desc_bit == last_zero || last_zero < 0) { last_device = 1; -- 1.9.1

3 4

[U-Boot] [PATCH v3 0/9] Stop AXP from crashing when enabling LDO3
by Priit Laes 07 Dec '18

07 Dec '18

This is a resend/v2 of a "Stop AXP from crashing when enabling LDO3" series, posted by Olliver Schinagl in March 2017. Unfortunately it never got past initial discussion [1], but most Olimex Lime2 boards are still running into this bug. When powering up an AXP209, the default value for LDO3 output is enabled. This works fine. However if for whatever reason, LDO3 is disabled, for example by OS during reboot and u-boot enables LDO3 again, the PMIC shuts down (without setting an interrupt) causing the board to hang. This behavior has been seen from Linux as well, u-boot disables LDO3 as a default value, the kernel enables it per its DTS, the kernel hangs as the PMIC gets shut down. The root cause is that some boards have too high capacitance on the LDO3 output port causing inrush currents exceeding the maximum of the AXP209. The fix is to turn on the LDO3 at the lowest possible voltage and then set the final voltage. If the capacitance is really big (due to a connected device for example) the AXP209 also features VRC, or Voltage Rate Control, allowing voltage to ramp up even slower. Similar changes need to be also implemented in the operating system driver side when driver needs to toggle power for the ALDO3 regulator. This patch series implements the above with a few tiny cleanups. The initial discussion with some scope screenshots can be found in the linux-sunxi mailing list [0]. And the initial series were posted to u-boot mailing list [1]. Signed-off-by: Olliver Schinagl <oliver(a)schinagl.nl> Signed-off-by: Priit Laes <plaes(a)plaes.org> [0] https://groups.google.com/forum/m/#!topic/linux-sunxi/EDvEsbHHqQI [1] https://lists.denx.de/pipermail/u-boot/2017-March/282789.html -- Changes since v2: - Collected Acked-by tags, patches 1,3-5 are now ripe for picking. - Olliver fixed wrong code in patch 2, thanks for Maxime for spotting - Fixed checkpatch error in patch 5 - Expanded commit message for patch 6 Changes from initial submission: - Rebased on top of latest master and fixed conflicts - Added comments about datasheet errors for patch 6 - Fixed some typos and checkpatch errors - Added patch to Olimex Lime2 eMMC board Olliver Schinagl (8): sunxi: board: Print error after power initialization fails sunxi: pmic_bus: Decrease boot time by not writing duplicate data power: axp209: Use BIT() macro power: axp209: Define the chip version mask power: axp209: Reduce magic values by adding defines for LDO[234] power: axp209: Add support for voltage rate control on LDO3 power: axp209: Limit inrush current for broken boards arm: sunxi: Reduce inrush current on Olimex OLinuXino-A20-Lime2 Priit Laes (1): arm: sunxi: Reduce inrush current on Olimex OLinuXino-A20-Lime2-eMMC arch/arm/mach-sunxi/pmic_bus.c | 6 ++- board/sunxi/board.c | 18 +++--- configs/A20-OLinuXino-Lime2-eMMC_defconfig | 2 +- configs/A20-OLinuXino-Lime2_defconfig | 2 +- drivers/power/Kconfig | 43 ++++++++++++++- drivers/power/axp209.c | 66 ++++++++++++++++++---- include/axp209.h | 70 +++++++++++++++++------ 7 files changed, 172 insertions(+), 35 deletions(-) base-commit: a3e1653ddeb02f39481eba572275016171e9670c -- git-series 0.9.1

5 23

[U-Boot] [PATCH v3 00/19] DM_I2C_COMPAT removal for all ti platforms
by Jean-Jacques Hiblot 07 Dec '18

07 Dec '18

This series remove the usage of the DM_I2C_COMPAT option for all the ti platforms. It also takes this opportunity to not disable DM_I2C in the SPL. There are a couples of issues to fix: - CMD_EEPROM does not support the DM API. Fixed by removing this option when DM_I2C is used without DM_I2C_COMPAT - i2c_get_chip_for_busnum() does not work when OF_CONTROL is not used (as is the case with am33xx SPL). - The I2C driver do not support DM_I2C without OF_CONTROL. - Most of the PMIC drivers do not support the I2C DM API. - Board detection is done prior DM initialization. Fixed by moving it after DM is initialized. That move breaks the DRA7 platforms (The fixes for that are at the last 5 patches this series) When all this is taken care of DM_I2C_COMPAT can be removed and DM_I2C enabled in the SPL. This has been tested with the following boards: - am437x SK - am335x SK - am335x beaglebone (both DM and non-DM config) - dra76 evm - am572 evm - k2g evm The following targets may be impacted by the changes related to SPL_OF_CONTROL and SPL_OF_PLATDATA: - am3517_evm_defconfig - omap3_logic_defconfig - chromebit_mickey_defconfig - chromebook_jerry_defconfig - chromebook_minnie_defconfig - evb-rk3399_defconfig - rock_defconfig It would be nice it some of you could try to boot them. Changes in v3: - removed commit introducing dm_i2c_probe_device(). Instead probe the presence of the chip on the I2C bus in i2c_get_chip_for_busnum(). - fdtdec_resetup() need not call fdtdec_setup() when only a single DTB is used. - Add documentation in README-fdt-control explaining why and how to use fdtdec_resetup() Changes in v2: - Add missing commit log to the commit disabling CMD_EEPROM when non-DM API is not available - don't use the DT to find the req_seq number if SPL_OF_PLATDATA is used. Instead do it as if SPL_OF_CONTROL is not defined. - Also add DM_I2C support to the twl6030 driver - remove the remaining non-DM I2C API call for pdu001 board. - Fixed warning in power_init_board() for the am43xx ti boards. Andreas Dannenberg (1): ti: common: board_detect: Allow DM I2C without CONFIG_DM_I2C_COMPAT Jean-Jacques Hiblot (17): cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT dm: i2c: Make i2c_get_chip_for_busnum() fail if the chip is not detected dm: device: Allow using uclass_find_device_by_seq() without OF_CONTROL configs: am335x: am57x: dra7x: Enable CONFIG_SPL_DM_SEQ_ALIAS i2c: omap24xx_i2c: Use platdata to probe the device am335x: Register the I2C controllers if DM_I2C is used. dts: am43x: omap5: Add node for I2C in SPL omap: detect the board after DM is available power: make most tps drivers and the twl4030 driver compatible with DM_I2C configs: am335x_pdu001: remove CONFIG_DM_I2C_COMPAT ti: remove usage of DM_I2C_COMPAT and don't disable DM_I2C in SPL am57xx: remove non-DM I2C code configs: dra7xx-evm: increase the size of the malloc's pool before relocation lib: fdtdec: Add function re-setup the fdt more effeciently drivers: core: Add the option SPL_DM_DEVICE_REMOVE to the Kconfig drivers: core: nullify gd->dm_root after dm_uninit() dra7: Allow selecting a new dtb after board detection. Vignesh R (1): i2c: omap24xx_i2c: Move away from SoC specific headers for reg offset arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 4 + arch/arm/dts/omap5-u-boot.dtsi | 4 + arch/arm/include/asm/arch-am33xx/i2c.h | 47 +-- arch/arm/include/asm/arch-omap3/i2c.h | 47 --- arch/arm/include/asm/arch-omap4/i2c.h | 45 --- arch/arm/include/asm/arch-omap5/i2c.h | 45 --- arch/arm/include/asm/omap_i2c.h | 24 ++ arch/arm/mach-keystone/ddr3_spd.c | 7 + arch/arm/mach-omap2/am33xx/board.c | 24 +- arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 56 +++- arch/arm/mach-omap2/clocks-common.c | 2 + arch/arm/mach-omap2/hwinit-common.c | 23 +- board/eets/pdu001/board.c | 1 - board/ti/am335x/board.c | 17 +- board/ti/am335x/mux.c | 11 + board/ti/am43xx/board.c | 46 ++- board/ti/am57xx/board.c | 25 +- board/ti/common/board_detect.c | 110 +++---- board/ti/ks2_evm/board_k2g.c | 11 + cmd/Kconfig | 1 + configs/am335x_pdu001_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 4 +- configs/dra7xx_hs_evm_defconfig | 1 + configs/omap3_logic_defconfig | 1 + doc/README.fdt-control | 18 ++ drivers/core/Kconfig | 12 +- drivers/core/device.c | 10 +- drivers/core/root.c | 1 + drivers/core/uclass.c | 24 ++ drivers/i2c/i2c-uclass.c | 11 + drivers/i2c/omap24xx_i2c.c | 467 ++++++++++++++++++--------- drivers/power/palmas.c | 39 +++ drivers/power/pmic/pmic_tps62362.c | 24 ++ drivers/power/pmic/pmic_tps65217.c | 44 ++- drivers/power/pmic/pmic_tps65218.c | 85 +++++ drivers/power/pmic/pmic_tps65910.c | 57 +++- drivers/power/twl4030.c | 39 +++ drivers/power/twl6030.c | 39 +++ include/asm-generic/global_data.h | 4 + include/configs/am43xx_evm.h | 2 + include/configs/pdu001.h | 6 - include/configs/ti_armv7_common.h | 18 +- include/dm/uclass-internal.h | 13 + include/fdtdec.h | 21 ++ include/palmas.h | 5 + include/power/tps65217.h | 2 + include/power/tps65910.h | 1 + include/twl4030.h | 6 +- include/twl6030.h | 5 + lib/fdtdec.c | 43 ++- 52 files changed, 1083 insertions(+), 472 deletions(-) create mode 100644 arch/arm/include/asm/omap_i2c.h -- 2.7.4

5 45

[U-Boot] [RESENT PATCH 1/2] rockchip: rk3128: use ROCKCHIP_BOOT_MODE_REG to update reboot flag
by Kever Yang 06 Dec '18

06 Dec '18

Use ROCKCHIP_BOOT_MODE_REG instead of grf structure so that we can re-use the source code later. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3128-board.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 145d96b1f0..94a03e2a38 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -179,6 +179,7 @@ config TPL_ROCKCHIP_BACK_TO_BROM config ROCKCHIP_BOOT_MODE_REG hex "Rockchip boot mode flag register address" default 0x200081c8 if ROCKCHIP_RK3036 + default 0x100a0038 if ROCKCHIP_RK3128 default 0x20004040 if ROCKCHIP_RK3188 default 0x110005c8 if ROCKCHIP_RK322X default 0xff730094 if ROCKCHIP_RK3288 diff --git a/arch/arm/mach-rockchip/rk3128-board.c b/arch/arm/mach-rockchip/rk3128-board.c index 7fd667a0b8..f64ccc51a0 100644 --- a/arch/arm/mach-rockchip/rk3128-board.c +++ b/arch/arm/mach-rockchip/rk3128-board.c @@ -114,12 +114,9 @@ int board_usb_cleanup(int index, enum usb_init_type init) #if CONFIG_IS_ENABLED(FASTBOOT) int fastboot_set_reboot_flag(void) { - struct rk3128_grf *grf; - printf("Setting reboot to fastboot flag ...\n"); - grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Set boot mode to fastboot */ - writel(BOOT_FASTBOOT, &grf->os_reg[0]); + writel(BOOT_FASTBOOT, CONFIG_ROCKCHIP_BOOT_MODE_REG); return 0; } -- 2.18.0

3 11