November 2019 - U-Boot

[U-Boot] [PATCH] m68k: Drop CONFIG_MCFPIT support
by Tom Rini 10 Jan '20

10 Jan '20

All platforms currently use the "MCFTMR" DMA timer rather than the PIT timer, so drop the MCFPIT code. Cc: Huan Wang <alison.wang(a)nxp.com> Cc: Angelo Dureghello <angelo(a)sysam.it> Cc: TsiChung Liew <Tsi-Chung.Liew(a)nxp.com> Cc: Wolfgang Wegner <w.wegner(a)astro-kom.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/m68k/include/asm/immap.h | 42 --------------------- arch/m68k/lib/time.c | 63 -------------------------------- board/freescale/m52277evb/README | 1 - board/freescale/m53017evb/README | 1 - board/freescale/m5373evb/README | 1 - board/freescale/m54455evb/README | 1 - include/configs/M5208EVBE.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/M5235EVB.h | 1 - include/configs/M53017EVB.h | 1 - include/configs/M5329EVB.h | 1 - include/configs/M5373EVB.h | 1 - include/configs/M54418TWR.h | 1 - include/configs/M54451EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/astro_mcf5373l.h | 1 - include/configs/stmark2.h | 1 - scripts/config_whitelist.txt | 1 - 18 files changed, 121 deletions(-) diff --git a/arch/m68k/include/asm/immap.h b/arch/m68k/include/asm/immap.h index 80fa25769b27..9e84fb9d260c 100644 --- a/arch/m68k/include/asm/immap.h +++ b/arch/m68k/include/asm/immap.h @@ -28,12 +28,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) #endif /* CONFIG_M520x */ @@ -62,12 +56,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) #endif /* CONFIG_M52277 */ @@ -91,12 +79,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) #endif /* CONFIG_M5235 */ @@ -285,12 +267,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) #endif /* CONFIG_M5301x */ @@ -315,12 +291,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) #endif /* CONFIG_M5329 && CONFIG_M5373 */ @@ -355,12 +325,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (192) @@ -391,12 +355,6 @@ #define CONFIG_SYS_TIMER_PRESCALER (((gd->bus_clk / 1000000) - 1) << 8) #endif -#ifdef CONFIG_MCFPIT -#define CONFIG_SYS_UDELAY_BASE (MMAP_PIT0) -#define CONFIG_SYS_PIT_BASE (MMAP_PIT1) -#define CONFIG_SYS_PIT_PRESCALE (6) -#endif - #define CONFIG_SYS_INTR_BASE (MMAP_INTC0) #define CONFIG_SYS_NUM_IRQS (128) diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index a6345a0bc9c0..52f6dd753321 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -108,69 +108,6 @@ ulong get_timer(ulong base) #endif /* CONFIG_MCFTMR */ -#if defined(CONFIG_MCFPIT) -#if !defined(CONFIG_SYS_PIT_BASE) -# error "CONFIG_SYS_PIT_BASE not defined!" -#endif - -static unsigned short lastinc; - -void __udelay(unsigned long usec) -{ - volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_UDELAY_BASE); - uint tmp; - - while (usec > 0) { - if (usec > 65000) - tmp = 65000; - else - tmp = usec; - usec = usec - tmp; - - /* Set up TIMER 3 as timebase clock */ - timerp->pcsr = PIT_PCSR_OVW; - timerp->pmr = 0; - /* set period to 1 us */ - timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN; - - timerp->pmr = tmp; - while (timerp->pcntr > 0) ; - } -} - -void timer_init(void) -{ - volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE); - timestamp = 0; - - /* Set up TIMER 4 as poll clock */ - timerp->pcsr = PIT_PCSR_OVW; - timerp->pmr = lastinc = 0; - timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN; - - return 0; -} - -ulong get_timer(ulong base) -{ - unsigned short now, diff; - volatile pit_t *timerp = (pit_t *) (CONFIG_SYS_PIT_BASE); - - now = timerp->pcntr; - diff = -(now - lastinc); - - timestamp += diff; - lastinc = now; - return timestamp - base; -} - -void wait_ticks(unsigned long ticks) -{ - u32 start = get_timer(0); - while (get_timer(start) < ticks) ; -} -#endif /* CONFIG_MCFPIT */ - /* * This function is derived from PowerPC code (read timebase as long long). * On M68K it just returns the timer value. diff --git a/board/freescale/m52277evb/README b/board/freescale/m52277evb/README index b7ceb5993e7a..76f4789335bf 100644 --- a/board/freescale/m52277evb/README +++ b/board/freescale/m52277evb/README @@ -79,7 +79,6 @@ RTC_DEBUG -- define to show RTC debug message CONFIG_CMD_DATE -- enable to use date feature in U-Boot CONFIG_MCFTMR -- define to use DMA timer -CONFIG_MCFPIT -- define to use PIT timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README index 2fca12c41706..a7074c9b7179 100644 --- a/board/freescale/m53017evb/README +++ b/board/freescale/m53017evb/README @@ -88,7 +88,6 @@ CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop CONFIG_MCFTMR -- define to use DMA timer -CONFIG_MCFPIT -- define to use PIT timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README index 757f0abdd744..f0a0631c94b3 100644 --- a/board/freescale/m5373evb/README +++ b/board/freescale/m5373evb/README @@ -87,7 +87,6 @@ CONFIG_SYS_FEC0_MIIBASE -- Set FEC0 MII base register MCFFEC_TOUT_LOOP -- set FEC timeout loop CONFIG_MCFTMR -- define to use DMA timer -CONFIG_MCFPIT -- define to use PIT timer CONFIG_SYS_I2C_FSL -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/board/freescale/m54455evb/README b/board/freescale/m54455evb/README index 4a8719333ac5..260aec9f1bec 100644 --- a/board/freescale/m54455evb/README +++ b/board/freescale/m54455evb/README @@ -110,7 +110,6 @@ CONFIG_SYS_ATA_STRIDE -- define for Interval between registers _IO_BASE -- define for IO base address CONFIG_MCFTMR -- define to use DMA timer -CONFIG_MCFPIT -- define to use PIT timer CONFIG_SYS_FSL_I2C -- define to use FSL common I2C driver CONFIG_SYS_I2C_SOFT -- define for I2C bit-banged diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 867ae8be6de9..92dad6ba6548 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -43,7 +43,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index a5a1c38f6e7d..884ed11dbab9 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -90,7 +90,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2c */ #define CONFIG_SYS_I2C diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 3c56cec425c4..360f7e242583 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -52,7 +52,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 24eb36159b30..ce3402ca0b3b 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -60,7 +60,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 2cff0d6cf602..ba7ed13da550 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -52,7 +52,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 576c075a174c..390bcf957e63 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -52,7 +52,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 72cc13ab79fc..2dbfb1d5ec44 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -137,7 +137,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2c */ #undef CONFIG_SYS_FSL_I2C diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 5482edeb2d91..2473377edbd7 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -103,7 +103,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2c */ #define CONFIG_SYS_I2C diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 9434cc278e2c..ea62d914b064 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -130,7 +130,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2c */ #define CONFIG_SYS_I2C diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 3d79311d625f..e1128043b02a 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -57,7 +57,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* I2C */ #define CONFIG_SYS_I2C diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h index a08d9950bd87..4f1e947d8631 100644 --- a/include/configs/stmark2.h +++ b/include/configs/stmark2.h @@ -60,7 +60,6 @@ /* Timer */ #define CONFIG_MCFTMR -#undef CONFIG_MCFPIT /* DSPI and Serial Flash */ #define CONFIG_CF_DSPI diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 284fb62e54c1..1da6bce9fd10 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1092,7 +1092,6 @@ CONFIG_MAX_RAM_BANK_SIZE CONFIG_MCF5249 CONFIG_MCF5253 CONFIG_MCFFEC -CONFIG_MCFPIT CONFIG_MCFRTC CONFIG_MCFTMR CONFIG_MCLK_DIS -- 2.17.1

2 2

[U-Boot] [PATCH] bootcount: add a DM i2c eeprom backing store for bootcount
by Robert Beckett 10 Jan '20

10 Jan '20

This driver allows the use of i2c eeprom device or partition as backing store for boot counter values with DM enabled. Signed-off-by: Robert Beckett <bob.beckett(a)collabora.com> --- drivers/bootcount/Kconfig | 10 ++++ drivers/bootcount/Makefile | 1 + drivers/bootcount/i2c-eeprom.c | 95 ++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 drivers/bootcount/i2c-eeprom.c diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index b7c29f2fd3..0e506c9ea2 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -96,6 +96,16 @@ config DM_BOOTCOUNT_RTC Accesses to the backing store are performed using the write16 and read16 ops of DM RTC devices. +config DM_BOOTCOUNT_I2C_EEPROM + bool "Support i2c eeprom devices as a backing store for bootcount" + depends on I2C_EEPROM + help + Enabled reading/writing the bootcount in a DM i2c eeprom device. + The wrapper device is to be specified with the compatible string + 'u-boot,bootcount-i2c-eeprom' and the 'i2c-eeprom'-property (a phandle + pointing to the underlying i2c eeprom device) and an optional 'offset' + property are supported. + endmenu endif diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index f9841d8615..73ccfb5a08 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_BOOTCOUNT_EXT) += bootcount_ext.o obj-$(CONFIG_DM_BOOTCOUNT) += bootcount-uclass.o obj-$(CONFIG_DM_BOOTCOUNT_RTC) += rtc.o +obj-$(CONFIG_DM_BOOTCOUNT_I2C_EEPROM) += i2c-eeprom.o diff --git a/drivers/bootcount/i2c-eeprom.c b/drivers/bootcount/i2c-eeprom.c new file mode 100644 index 0000000000..ee760a2742 --- /dev/null +++ b/drivers/bootcount/i2c-eeprom.c @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2019 Collabora + * (C) Copyright 2019 GE + */ + +#include <common.h> +#include <bootcount.h> +#include <dm.h> +#include <i2c_eeprom.h> + +static const u8 bootcount_magic = 0xbc; + +struct bootcount_i2c_eeprom_priv { + struct udevice *i2c_eeprom; + u32 offset; +}; + +static int bootcount_i2c_eeprom_set(struct udevice *dev, const u32 a) +{ + struct bootcount_i2c_eeprom_priv *priv = dev_get_priv(dev); + const u16 val = bootcount_magic << 8 | (a & 0xff); + + if (i2c_eeprom_write(priv->i2c_eeprom, priv->offset, + (uint8_t *)&val, 2) < 0) { + debug("%s: write failed\n", __func__); + return -EIO; + } + + return 0; +} + +static int bootcount_i2c_eeprom_get(struct udevice *dev, u32 *a) +{ + struct bootcount_i2c_eeprom_priv *priv = dev_get_priv(dev); + u16 val; + + if (i2c_eeprom_read(priv->i2c_eeprom, priv->offset, + (uint8_t *)&val, 2) < 0) { + debug("%s: read failed\n", __func__); + return -EIO; + } + + if (val >> 8 == bootcount_magic) { + *a = val & 0xff; + return 0; + } + + debug("%s: bootcount magic does not match on %04x\n", __func__, val); + return -EIO; +} + +static int bootcount_i2c_eeprom_probe(struct udevice *dev) +{ + struct ofnode_phandle_args phandle_args; + struct bootcount_i2c_eeprom_priv *priv = dev_get_priv(dev); + struct udevice *i2c_eeprom; + + if (dev_read_phandle_with_args(dev, "i2c-eeprom", NULL, 0, 0, + &phandle_args)) { + debug("%s: i2c-eeprom backing device not specified\n", + dev->name); + return -ENOENT; + } + + if (uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, phandle_args.node, + &i2c_eeprom)) { + debug("%s: could not get backing device\n", dev->name); + return -ENODEV; + } + + priv->i2c_eeprom = i2c_eeprom; + priv->offset = dev_read_u32_default(dev, "offset", 0); + + return 0; +} + +static const struct bootcount_ops bootcount_i2c_eeprom_ops = { + .get = bootcount_i2c_eeprom_get, + .set = bootcount_i2c_eeprom_set, +}; + +static const struct udevice_id bootcount_i2c_eeprom_ids[] = { + { .compatible = "u-boot,bootcount-i2c-eeprom" }, + { } +}; + +U_BOOT_DRIVER(bootcount_spi_flash) = { + .name = "bootcount-i2c-eeprom", + .id = UCLASS_BOOTCOUNT, + .priv_auto_alloc_size = sizeof(struct bootcount_i2c_eeprom_priv), + .probe = bootcount_i2c_eeprom_probe, + .of_match = bootcount_i2c_eeprom_ids, + .ops = &bootcount_i2c_eeprom_ops, +}; -- 2.20.1

2 1

[U-Boot] [PATCH 0/6] J721e HS device support
by Andrew F. Davis 10 Jan '20

10 Jan '20

Hello all, This series brings up High-Security (HS) device support on the J721e platform. Support for this K3 HS device is much like the existing AM65x HS and this series leverages much of that support. There are also a couple tangentially related fixups that I noticed while adding this support and testing. Although not strictly needed they do allow J721e HS to just work out-of-box by the time the last patch adds the defconfigs. Thanks, Andrew Andrew F. Davis (6): configs: j721e_evm.h: Sync J721e environment configuration with AM65x configs: ti: Factor out call to 'args_mmc' into MMC common environment arm: K3: Fix header comment match AM6 specific file function arm: K3: Disable ROM configured firewalls arm: K3: Increase default SYSFW image size allocation configs: Add configs for J721e High Security EVM arch/arm/mach-k3/Kconfig | 2 +- arch/arm/mach-k3/am6_init.c | 28 +++++++- arch/arm/mach-k3/common.c | 30 ++++++++ arch/arm/mach-k3/common.h | 7 ++ arch/arm/mach-k3/j721e_init.c | 52 ++++++++++++++ configs/j721e_hs_evm_a72_defconfig | 106 +++++++++++++++++++++++++++++ configs/j721e_hs_evm_r5_defconfig | 102 +++++++++++++++++++++++++++ include/configs/j721e_evm.h | 16 ++++- include/configs/ti_armv7_common.h | 1 - include/environment/ti/mmc.h | 5 +- 10 files changed, 341 insertions(+), 8 deletions(-) create mode 100644 configs/j721e_hs_evm_a72_defconfig create mode 100644 configs/j721e_hs_evm_r5_defconfig -- 2.17.1

2 10

[U-Boot] [PATCH v2 00/14] dm: add support of new binding in gpio and pincontrol
by Patrick Delaunay 10 Jan '20

10 Jan '20

Hi, I create this patchset to prepare alignment of stm32mp157c-ev1 device-tree with the linux kernel v5.4. One node for touch screen support use the IRQ line configuration using the new kernel binding introduced by the linux kernel commit ede033e1e863c from v5.1 ('dt-bindings: gpio: document the new pull-up/pull-down flags') https://github.com/torvalds/linux/commit/ede033e1e863c gt9147: goodix_ts@5d { compatible = "goodix,gt9147"; reg = <0x5d>; status = "okay"; irq-gpios = <&stmfx_pinctrl 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; irq-flags = <IRQ_TYPE_EDGE_RISING>; }; In Linux Kernel, the GPIO configuration (pull down/up) are now managed by GPIO lib but they are not yet supported by U-boot in uclass GPIO or pincontrol (when used by gpio-hog). This serie adds the support of theses new defines (with ops get_config/set_config) added in kernel GPIO binding and adds the test in sandbox. NB: In a second phase, the removed set_open_drain/get_open_drain API could be replaced by the new ops get_config/set_config. I also align the gpio binding file with the version from the latest kernel v5.3 (I don't think I remove any U-Boot specific part with this patch) I move the added information on gpio hog code in a new file doc/README.gpio. To have functional test, I convert pinctrl-generic to livetree otherwise the pins are not correctly configured in sandbox, when CONFIG_OF_LIVE is activated. For the test on gpio I add information for pin configuration in output of the command "pinmux status" with a simple pincontrol driver associated to GPIO driver. NB: after rebase on master branch, the sandbox test "ut dm power_domain" is failing; it was not the case for v2019.10. => ut dm power_domain Test: dm_test_power_domain: power-domain.c ../test/dm/test-main.c:73, dm_test_destroy(): 0 == uclass_destroy(uc): Expected 0, got -22 ../test/dm/test-main.c:108, dm_do_test(): 0 == dm_test_destroy(uts): Expected 0, got 1 ../test/dm/test-main.c:170, dm_test_main(): 0 == dm_do_test(uts, test, 1): Expected 0, got 1 I think it is linked to commit 52edfed65de9 ("dm: core: device: switch off power domain after device removal") After some investigation : 1/ pincontrol is remove in uclass_destroy(0) 2/ power domain is removed in uclass_destroy(0) 3/ device_chld_unbind() dev_power_domain_off -> probe power domain (again) --> pinctrl_select_state() in device_probe() ---> pincontrol is probed (again) 4/ at the end of dev_power_domain_off() function the power domain is unbind in dev_power_domain_off device_remove(pd.dev, DM_REMOVE_NORMAL); So power domain driver is correctly removed but it is not the case for the pincontrol driver and that cause the issue. The problem occurs after my serie only because I introduce a second pincontrol driver for sandbox, so the dynamic changes but my serie is not the root cause of the issue, it should be investigated by power domain users. Workaround to allow test execution: "dm: core: device: don't probe pinctrl for power domain" My working branch: https://github.com/patrickdelaunay/u-boot/tree/dm CI-Travis build: https://travis-ci.org/patrickdelaunay/u-boot/builds/616716294 Issue for tbs2910 board not reproduced locally with buildman +u-boot.imx exceeds file size limit: 1405+ limit: 0x5fc00 bytes 1406+ actual: 0x60c00 bytes 1407+ excess: 0x1000 bytes Regards Patrick Delaunay Changes in v2: - use the dev_ API instead of ofnode_ function. - Identify property with a new struct ofprop as proposed by Simon Glass - Add dev_ iterate functions - Change dev_ functions in pinctrl-generic - remove the unused GPIOD_REQUESTED - remove the open_drain API and ops - add gpio descriptor initialization helper - change the proposed ops for pin config to set_dir_flags/get_dir_flags - reused the existing API dm_gpio_set_dir_flags/dm_gpio_set_dir - add a new API dm_gpio_get_dir_flags - simplify sandbox GPIO driver: save dir_flags (GPIOD_...) and remove internal flags (GPIOF_...); the previous path "gpio: sandbox: cleanup flag support" is no more needed - add unitary test in dm_test_gpio for set_dir_flags - add some function check in dm_test_gpio_phandles - dm_test_gpio_pin_config change to dm_test_gpio_get_dir_flags - Adapt sandbox_pinctrl_gpio driver with the saved dir_flags in sandbox gpio driver - rebase on v2020.01-rc3 Patrick Delaunay (14): dm: pinctrl: convert pinctrl-single to livetree dm: core: add ofnode and dev function to iterate on node property dm: pinctrl: migrate pinctrl-generic to livetree dt-bindings: gpio: document the new pull-up/pull-down flags gpio: remove GPIOD_REQUESTED gpio: remove the open_drain API and ops gpio: add gpio descriptor initialization helper gpio: add ops for configuration with dir flags dt-bindings: gpio: alignment with kernel v5.3 pinctrl: sandbox: Add mux information in get_pin_muxing test: dm: update test for pins configuration in pinctrl node gpio: sandbox: cleanup binding support test: dm: update test for pins configuration in gpio test: pinmux: add pincontrol-gpio for pin configuration arch/sandbox/dts/test.dts | 85 +++++-- arch/sandbox/include/asm/gpio.h | 38 +-- doc/README.gpio | 42 ++++ doc/device-tree-bindings/gpio/gpio.txt | 304 ++++++++++++---------- drivers/core/of_access.c | 32 +++ drivers/core/ofnode.c | 48 ++++ drivers/core/read.c | 16 ++ drivers/gpio/gpio-uclass.c | 192 ++++++++++---- drivers/gpio/mpc8xxx_gpio.c | 22 -- drivers/gpio/sandbox.c | 321 +++++++++++++++++++----- drivers/pinctrl/pinctrl-generic.c | 30 +-- drivers/pinctrl/pinctrl-sandbox.c | 44 +++- drivers/pinctrl/pinctrl-single.c | 27 +- include/asm-generic/gpio.h | 104 ++++---- include/dm/of_access.h | 40 +++ include/dm/ofnode.h | 63 ++++- include/dm/read.h | 67 +++++ include/dt-bindings/gpio/gpio.h | 6 + include/dt-bindings/gpio/sandbox-gpio.h | 24 ++ test/dm/gpio.c | 69 ++++- test/dm/test-fdt.c | 2 +- test/py/tests/test_pinmux.py | 38 ++- 22 files changed, 1216 insertions(+), 398 deletions(-) create mode 100644 doc/README.gpio create mode 100644 include/dt-bindings/gpio/sandbox-gpio.h -- 2.17.1

3 26

[U-Boot] [PATCH v2 1/4] dm: spi: Return 0 if driver does not implement ops->cs_info
by Bin Meng 09 Jan '20

09 Jan '20

If an SPI controller driver does not implement ops->cs_info, that probably means any chip select number could be valid, hence let's return 0 for spi_cs_info(). Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Changes in v2: - update spi-howto.rst to reflect the code changes doc/driver-model/spi-howto.rst | 4 ++-- drivers/spi/spi-uclass.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/doc/driver-model/spi-howto.rst b/doc/driver-model/spi-howto.rst index a538fdc..7e64fae 100644 --- a/doc/driver-model/spi-howto.rst +++ b/doc/driver-model/spi-howto.rst @@ -634,8 +634,8 @@ method for cs_info() to deal with this. If you don't provide it, then the device tree will be used to determine what chip selects are valid. Return -ENODEV if the supplied chip select is invalid, or 0 if it is valid. -If you don't provide the cs_info() method, -ENODEV is assumed for all -chip selects that do not appear in the device tree. +If you don't provide the cs_info() method, 0 is assumed for all chip selects +that do not appear in the device tree. Test it diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 88cb2a1..24de0b5 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -237,11 +237,10 @@ int spi_cs_info(struct udevice *bus, uint cs, struct spi_cs_info *info) return ops->cs_info(bus, cs, info); /* - * We could assume there is at least one valid chip select, but best - * to be sure and return an error in this case. The driver didn't - * care enough to tell us. + * We could assume there is at least one valid chip select. + * The driver didn't care enough to tell us. */ - return -ENODEV; + return 0; } int spi_find_bus_and_cs(int busnum, int cs, struct udevice **busp, -- 2.7.4

2 15

[U-Boot] [PATCH] bdinfo: show multi_dtb_fit
by Heiko Schocher 08 Jan '20

08 Jan '20

if MULTI_DTB_FIT is enabled it is helpful to display the value of gd->multi_dtb_fit in bdinfo. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- travis build: https://travis-ci.org/hsdenx/u-boot-test/builds/609100901 cmd/bdinfo.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index ae6006f85f..e12c96b767 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -347,6 +347,9 @@ static int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, #if CONFIG_VAL(SYS_MALLOC_F_LEN) printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr, CONFIG_VAL(SYS_MALLOC_F_LEN)); +#endif +#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) + print_num("multi_dtb_fit", (ulong)gd->multi_dtb_fit); #endif if (gd->fdt_blob) print_num("fdt_blob", (ulong)gd->fdt_blob); -- 2.21.0

3 2

[U-Boot] [PATCH] power: regulator: support off-on-delay-us
by Peng Fan 08 Jan '20

08 Jan '20

off-on-delay-us has been supported by Linux, so let's use it. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- V1: Linux Tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/… drivers/power/regulator/regulator_common.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 2041086567..939efb2c0d 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -37,7 +37,11 @@ int regulator_common_ofdata_to_platdata(struct udevice *dev, dev_pdata->startup_delay_us = dev_read_u32_default(dev, "startup-delay-us", 0); dev_pdata->off_on_delay_us = + dev_read_u32_default(dev, "off-on-delay-us", 0); + if (!dev_pdata->off_on_delay_us) { + dev_pdata->off_on_delay_us = dev_read_u32_default(dev, "u-boot,off-on-delay-us", 0); + } return 0; } -- 2.16.4

2 1

[U-Boot] [PATCH v2 0/6] remoteproc: add elf resource table loader
by Fabien Dessenne 08 Jan '20

08 Jan '20

Add some helpers that can be called by the drivers to load the firmware resource table from an elf32 / elf64 image. The stm32 remoteproc driver makes use of it, to load the resource table before the elf image itself. Changes since v1: -Do not fixup the DeviceTree to track the stm32 coprocessor state. Instead of this, use a dedicated register. Fabien Dessenne (6): remoteproc: elf_loader: Add elf resource table load support stm32mp1: declare backup registers for coprocessor stm32mp1: reset coprocessor status at cold boot remoteproc: stm32: track the coprocessor state in a backup register stm32mp1: remove copro_state environment variable remoteproc: stm32: load resource table from firmware arch/arm/mach-stm32mp/cpu.c | 7 + arch/arm/mach-stm32mp/include/mach/stm32.h | 9 + board/st/stm32mp1/stm32mp1.c | 4 +- drivers/remoteproc/rproc-elf-loader.c | 269 +++++++++++++++++++++++++++++ drivers/remoteproc/stm32_copro.c | 27 ++- include/remoteproc.h | 70 ++++++++ test/dm/remoteproc.c | 91 ++++++++-- 7 files changed, 454 insertions(+), 23 deletions(-) -- 2.7.4

4 19

[U-Boot] [PATCH PATCH v6 00/13] Add support for applications of overlays in SPL
by Jean-Jacques Hiblot 08 Jan '20

08 Jan '20

The purpose of this series is to provide the SPL with ability to apply overlays for u-boot. Our use-case is the support of the daughter boards of the AM65x and J721e EVMs. In Linux, each board is supported by a unique overlay. The presence of the boards is detected at runtime, and some useful features (like USB) are implemented on those daughter boards. Instead of providing multiple dtbs and fall in a combinatorial pit, we propose to use DT overlays. On arm, if overlay are supported, this series increases the size of the SPL by 3.2 kB. Travis build : https://travis-ci.org/jjhiblot/u-boot/builds/600742163 Changes in v6: - Instead of matching a overlay by the name of it's node. Try to match it first with the description, and then with the node's name. This allows to use makeimg to add the overlays to u-boot.img and not use a custom SPL_FIT_GENERATOR script Changes in v5: - Do not allocate the buffer if not needed (no overlay). - Add a Kconfig option for the buffer size - board_get_fit_loadable() returns an error code instead of a NULL string in case of failure -reword commit log Changes in v4: - use CONFIG_IS_ENABLED() instead of #idef - make sure that the temp buffer is freed in all cases - Use the board driver infrastructure to get the image names from the board code. - Remove a patch that passed the board name to the FIT generator. If needed the generator can get it from elsewhere - Add a fix to not load the firmware twice (once as a firmware and once as a loadable) Changes in v3: - Add a new config option: SPL_LOAD_FIT_APPLY_OVERLAY. By default, it is not selected. - removed the RFC prefix. This work will be needed soon by TI's AM65x platform. and can probably benefit other modular platforms - removed the last patch that provided an example of how to use this with on a DRA76. - removed the patch that made u-boot.img a symlink to u-boot.itb because it breaks the build of many platforms (because files required to build the ITB are missing) - removed the patch to reduce the footprint of the am335x SPL. (already merged) - Made the boot flow more permissive (don't fail immediately if an overlay is not present) and more verbose when an error occures - handle the dependencies of the FIT generation in a more generic way - use a dedicated kconfig option to enable the application of the overlays by the SPL. Changes in v2: - depend on SPL_DM - update the commit log - reworked board_fit_get_additionnal_images() and how it used in spl_fit.c - removed dtbo generation from dtso files and use .dts extension for the overlays - add dynamic allocation usage in a separate patch - defconfig change for the am335x_evm Jean-Jacques Hiblot (12): spl: fit: don't load the firmware twice spl: fit: Make room in the FDT before applying overlays spl: fit: allocate a temporary buffer to load the overlays spl: fit: Do not fail immediately if an overlay is not available spl: fit: be more verbose when an error occurs when applying the overlays Makefile.lib: include /__symbols__ in dtb if SPL_LOAD_FIT_APPLY_OVERLAY is enabled spl: fit: constify the output parameter of spl_fit_get_image_name() drivers: board: Make the board drivers available in SPL drivers: board: Add get_fit_loadable() include: board: provide empty stubs when the BOARD option is not selected dts: Add support for adding DT overlays in u-boot.img spl: fit: Allow the board to tell if more images must be loaded from FIT Michal Simek (1): spl: fit: Add support for applying DT overlay Kconfig | 18 +++++ Makefile | 3 +- common/spl/spl_fit.c | 151 ++++++++++++++++++++++++++++++++--- drivers/Makefile | 2 +- drivers/board/Kconfig | 3 + drivers/board/Makefile | 2 +- drivers/board/board-uclass.c | 11 +++ dts/Kconfig | 8 ++ include/board.h | 74 +++++++++++++++++ scripts/Makefile.lib | 4 + 10 files changed, 263 insertions(+), 13 deletions(-) -- 2.17.1

3 32

[U-Boot] [PATCH 1/3] tools: dumpimage: Provide more feedback on internal errors
by Andrew F. Davis 08 Jan '20

08 Jan '20

The dumpimage utility errors out in a number of places without providing sufficient feedback to allow the user to easily determine what has gone wrong. Add additional error messages to make the cause of the failure more obvious. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- tools/dumpimage.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/dumpimage.c b/tools/dumpimage.c index ee3d41dda4..d5f893daf1 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -35,14 +35,23 @@ static int dumpimage_extract_subimage(struct image_type_params *tparams, if (tparams->verify_header) { retval = tparams->verify_header((unsigned char *)ptr, sbuf->st_size, &params); - if (retval != 0) + if (retval != 0) { + fprintf(stderr, "%s: failed to verify header of %s\n", + params.cmdname, tparams->name); return -1; + } + /* * Extract the file from the image * if verify is successful */ if (tparams->extract_subimage) { retval = tparams->extract_subimage(ptr, &params); + if (retval != 0) { + fprintf(stderr, "%s: extract_subimage failed for %s\n", + params.cmdname, tparams->name); + return -3; + } } else { fprintf(stderr, "%s: extract_subimage undefined for %s\n", @@ -175,6 +184,9 @@ int main(int argc, char **argv) * image type. Returns the error code if not matched */ retval = dumpimage_extract_subimage(tparams, ptr, &sbuf); + if (retval) + fprintf(stderr, "%s: Can't extract subimage from %s\n", + params.cmdname, params.imagefile); } else { /* * Print the image information for matched image type -- 2.17.1

3 10