January 2020 - U-Boot

[PATCH 1/1] tools: correct Markdown in concurrencytest/README.md
by Heinrich Schuchardt 31 Jan '20

31 Jan '20

Remove incorrect indentation. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- tools/concurrencytest/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/concurrencytest/README.md b/tools/concurrencytest/README.md index 8e65776f17..2d7fe75df5 100644 --- a/tools/concurrencytest/README.md +++ b/tools/concurrencytest/README.md @@ -16,8 +16,8 @@ pip install concurrencytest Requires: - * [testtools](https://pypi.python.org/pypi/testtools) : `pip install testtools` - * [python-subunit](https://pypi.python.org/pypi/python-subunit) : `pip install python-subunit` +* [testtools](https://pypi.python.org/pypi/testtools) : `pip install testtools` +* [python-subunit](https://pypi.python.org/pypi/python-subunit) : `pip install python-subunit` ---- -- 2.24.1

2 1

[PATCH] common/board_f.c: Remove arch-specific checks for cpucheck
by Ovidiu Panait 31 Jan '20

31 Jan '20

This removes the arch-specific checks for "checkcpu" function from the init sequence. Make "checkcpu" generic and provide a weak nop stub instead. Signed-off-by: Ovidiu Panait <ovpanait(a)gmail.com> --- common/board_f.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 3f0132a6e3..8fa26e3ca5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -862,6 +862,11 @@ __weak int arch_cpu_init_dm(void) return 0; } +__weak int checkcpu(void) +{ + return 0; +} + static const init_fnc_t init_sequence_f[] = { setup_mon_len, #ifdef CONFIG_OF_CONTROL @@ -904,9 +909,7 @@ static const init_fnc_t init_sequence_f[] = { console_init_f, /* stage 1 init of console */ display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ -#if defined(CONFIG_PPC) || defined(CONFIG_SH) || defined(CONFIG_X86) checkcpu, -#endif #if defined(CONFIG_SYSRESET) print_resetinfo, #endif -- 2.17.1

2 1

[PATCHv3] cmd/gpt: Address error cases during gpt rename more correctly
by Tom Rini 31 Jan '20

31 Jan '20

New analysis by the tool has shown that we have some cases where we weren't handling the error exit condition correctly. When we ran into the ENOMEM case we wouldn't exit the function and thus incorrect things could happen. Rework the unwinding such that we don't need a helper function now and free what we may have allocated. Fixes: 18030d04d25d ("GPT: fix memory leaks identified by Coverity") Reported-by: Coverity (CID: 275475, 275476) Cc: Alison Chaiken <alison(a)she-devel.com> Cc: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> Cc: Jordy <jordy(a)simplyhacker.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v3: - Move del_gpt_info() call into the unwind as set_gpt_info() will have been called at that point and we need to clear it. (Simon) Changes in v2: - Initialize str_disk_guid to NULL to be sure we can test that it has been set later on (Simon, Jordy). --- cmd/gpt.c | 47 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 35 deletions(-) diff --git a/cmd/gpt.c b/cmd/gpt.c index 0c4349f4b249..964702bad43e 100644 --- a/cmd/gpt.c +++ b/cmd/gpt.c @@ -633,21 +633,6 @@ static int do_disk_guid(struct blk_desc *dev_desc, char * const namestr) } #ifdef CONFIG_CMD_GPT_RENAME -/* - * There are 3 malloc() calls in set_gpt_info() and there is no info about which - * failed. - */ -static void set_gpt_cleanup(char **str_disk_guid, - disk_partition_t **partitions) -{ -#ifdef CONFIG_RANDOM_UUID - if (str_disk_guid) - free(str_disk_guid); -#endif - if (partitions) - free(partitions); -} - static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, char *name1, char *name2) { @@ -655,7 +640,7 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, struct disk_part *curr; disk_partition_t *new_partitions = NULL; char disk_guid[UUID_STR_LEN + 1]; - char *partitions_list, *str_disk_guid; + char *partitions_list, *str_disk_guid = NULL; u8 part_count = 0; int partlistlen, ret, numparts = 0, partnum, i = 1, ctr1 = 0, ctr2 = 0; @@ -697,14 +682,8 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, /* set_gpt_info allocates new_partitions and str_disk_guid */ ret = set_gpt_info(dev_desc, partitions_list, &str_disk_guid, &new_partitions, &part_count); - if (ret < 0) { - del_gpt_info(); - free(partitions_list); - if (ret == -ENOMEM) - set_gpt_cleanup(&str_disk_guid, &new_partitions); - else - goto out; - } + if (ret < 0) + goto out; if (!strcmp(subcomm, "swap")) { if ((strlen(name1) > PART_NAME_LEN) || (strlen(name2) > PART_NAME_LEN)) { @@ -766,14 +745,8 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, * Even though valid pointers are here passed into set_gpt_info(), * it mallocs again, and there's no way to tell which failed. */ - if (ret < 0) { - del_gpt_info(); - free(partitions_list); - if (ret == -ENOMEM) - set_gpt_cleanup(&str_disk_guid, &new_partitions); - else - goto out; - } + if (ret < 0) + goto out; debug("Writing new partition table\n"); ret = gpt_restore(dev_desc, disk_guid, new_partitions, numparts); @@ -795,10 +768,14 @@ static int do_rename_gpt_parts(struct blk_desc *dev_desc, char *subcomm, } printf("new partition table with %d partitions is:\n", numparts); print_gpt_info(); - del_gpt_info(); out: - free(new_partitions); - free(str_disk_guid); + del_gpt_info(); +#ifdef CONFIG_RANDOM_UUID + if (str_disk_guid) + free(str_disk_guid); +#endif + if (new_partitions) + free(new_partitions); free(partitions_list); return ret; } -- 2.17.1

3 3

[PATCH] board: tbs2910: Add support for generic distro configuration
by Denis 'GNUtoo' Carikli 30 Jan '20

30 Jan '20

This keeps the compatibility with the old bootcmd. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)cyberdimension.org> --- include/configs/tbs2910.h | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b598fca1ec..8867918f37 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -8,6 +8,26 @@ #ifndef __TBS2910_CONFIG_H #define __TBS2910_CONFIG_H +#define CONFIG_BOOTCOMMAND \ + "mmc rescan; " \ + "if run bootcmd_up1; then " \ + "run bootcmd_up2; " \ + "else " \ + "run bootcmd_mmc || run distro_bootcmd; " \ + "fi" + +#ifndef CONFIG_SPL_BUILD +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(SATA, sata, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) +#include <config_distro_bootcmd.h> +#endif + #include "mx6_common.h" /* General configuration */ @@ -80,6 +100,13 @@ #define CONFIG_BOARD_SIZE_LIMIT 392192 /* (CONFIG_ENV_OFFSET - 1024) */ #define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr=0x13000000\0" \ + "fdt_addr_r=0x13000000\0" \ + "initrd_high=0xffffffff\0" \ + "kernel_addr_r=0x10008000\0" \ + "pxefile_addr_r=0x10008000\0" \ + "ramdisk_addr_r=0x18000000\0" \ + "scriptaddr=0x14000000\0" \ "bootargs_mmc1=console=ttymxc0,115200 di0_primary console=tty1\0" \ "bootargs_mmc2=video=mxcfb0:dev=hdmi,1920x1080M@60 " \ "video=mxcfb1:off video=mxcfb2:off fbmem=28M\0" \ @@ -102,14 +129,8 @@ "setenv stderr serial,vga\0" \ "stderr=serial,vga\0" \ "stdin=serial,usbkbd\0" \ - "stdout=serial,vga\0" - -#define CONFIG_BOOTCOMMAND \ - "mmc rescan; " \ - "if run bootcmd_up1; then " \ - "run bootcmd_up2; " \ - "else " \ - "run bootcmd_mmc; " \ - "fi" + "stdout=serial,vga\0" \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + BOOTENV #endif /* __TBS2910_CONFIG_H * */ -- 2.24.1

5 20

[PATCH v3 0/6] Add Cortina Access basic DM drivers
by Alex Nemirovsky 30 Jan '20

30 Jan '20

Cortina Access management has decided that we want to add formal upstream support of u-boot going forward for our line of SoCs and evaluation boards. Our line of SoC’s all begin with the “CA” designation followed by 4 digits. i.e. CAxxxx. The CAxxxx series supports both ARM and MIPS ISA based custom cores. All our drivers have cross platform support for both CPU ISAs. They will be placed in the normal drivers tree in u-boot. In addition, our SoCs and development boards share common Cortina specific features which are not driver related. Those changes will be maintained in board/cortina/common. While specific development boards will be in board/cortina/board_name. We would like to have a git-mailrc alias of "cortina" to allow us to better maintain and support our boards and common features found in the board/cortina subtree. Changes in v3: - Remove CA ARM and MIPS common subdirectories from board/cortina/common after further discussions with trini - clean up comment blocks - fix rmw of baud rate bitfield change - fixed dts closing bracket indentation - presidio.h: remove deadcode from presidio.h - presidio.h: remove CA_REG_READ/CA_REG_WRITE wrapper macros - presidio.h: remove CA77xx define replace use CA common Kconfig SoC selection instead - select SOC_CA7774 via board's Kconfig - select BIT64 via board's Kconfig instead of presidio.h Changes in v2: - Modified filepath for CA ARM and MIPS per trini's recommendation - Rename driver in DT namespace for consistency between all CA drivers. - Remove blank line after SPDX identifier - Remove Authorship as it is already recorded within Git and is redundant - Replace printf() as debug() - Rename driver in DT namespace for consistency between all CA drivers. - Remove blank line after SPDX identifier - Remove authorship comment as it is already recorded within Git and is redundant - Use setbits_32() for read-modify-write operation. - Rename driver in DT namespace for consistency between all CA drivers. - Remove blank line after SPDX identifier - Remove authorship comment as it is already recorded within Git and is redundant - Merge serial_cortina.h reg defines into serial_cortina.c - Modify ca_serial_pending() and API to get resource. Alex Nemirovsky (2): MAINTAINERS, git-mailrc: cortina: add Custodian for Cortina Access Inc. board: presidio-asic: Add basic G3 engr. development board support Jason Li (4): gpio: do not include <asm/arch/gpio.h> for Cortina CAxxxx SoCs gpio: cortina_gpio: add DM_GPIO driver for CAxxxx SoCs watchdog: cortina_wdt: add support for HW WDT on CAxxxx SoCs serial: serial_cortina: add UART DM driver for CAxxxx SoCs MAINTAINERS | 16 +++ arch/arm/Kconfig | 5 + arch/arm/dts/Makefile | 2 + arch/arm/dts/ca-presidio-engboard.dts | 69 +++++++++++ arch/arm/include/asm/gpio.h | 2 +- arch/arm/mach-cortina/Makefile | 5 + board/cortina/common/Kconfig | 6 + board/cortina/presidio-asic/Kconfig | 18 +++ board/cortina/presidio-asic/MAINTAINERS | 6 + board/cortina/presidio-asic/Makefile | 8 ++ board/cortina/presidio-asic/lowlevel_init.S | 87 ++++++++++++++ board/cortina/presidio-asic/presidio.c | 134 ++++++++++++++++++++++ configs/cortina_presidio-asic-base_defconfig | 45 ++++++++ doc/git-mailrc | 2 + drivers/gpio/Kconfig | 8 ++ drivers/gpio/Makefile | 1 + drivers/gpio/cortina_gpio.c | 111 ++++++++++++++++++ drivers/serial/Kconfig | 7 ++ drivers/serial/Makefile | 2 +- drivers/serial/serial_cortina.c | 164 +++++++++++++++++++++++++++ drivers/watchdog/Kconfig | 8 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cortina_wdt.c | 138 ++++++++++++++++++++++ include/configs/presidio_asic.h | 114 +++++++++++++++++++ 24 files changed, 957 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/ca-presidio-engboard.dts create mode 100644 arch/arm/mach-cortina/Makefile create mode 100644 board/cortina/common/Kconfig create mode 100644 board/cortina/presidio-asic/Kconfig create mode 100644 board/cortina/presidio-asic/MAINTAINERS create mode 100644 board/cortina/presidio-asic/Makefile create mode 100644 board/cortina/presidio-asic/lowlevel_init.S create mode 100644 board/cortina/presidio-asic/presidio.c create mode 100644 configs/cortina_presidio-asic-base_defconfig create mode 100644 drivers/gpio/cortina_gpio.c create mode 100644 drivers/serial/serial_cortina.c create mode 100644 drivers/watchdog/cortina_wdt.c create mode 100644 include/configs/presidio_asic.h -- 2.7.4

2 12

[U-Boot] [PATCH] tools: env: handle corrupted ubi volumes during sanity check
by Martin Hundebøll 30 Jan '20

30 Jan '20

A partially written ubi volume is marked as such by the kernel. Such a mark causes the initial ubi sanity check to fail instead of falling back to the redundant environment. Fix this by special casing the EBADF return code from the UBI_IOCEBISMAP ioctl, as this is only ever returned in case of a partially written volume. The CRC checking will decide which environment to use anyways. Signed-off-by: Martin Hundebøll <martin(a)geanix.com> --- tools/env/fw_env.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index cfada0ee11..f7904ae036 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1608,7 +1608,13 @@ static int check_device_config(int dev) if (IS_UBI(dev)) { rc = ioctl(fd, UBI_IOCEBISMAP, &lnum); - if (rc < 0) { + if (rc < 0 && errno == EBADF) { + /* EBADF here means we are dealing with a partially + * written UBI volume, Leave it for now to allow the + * use of the redundant env. CRC checking will decide + * which to use */ + rc = 0; + } else if (rc < 0) { fprintf(stderr, "Cannot get UBI information for %s\n", DEVNAME(dev)); goto err; -- 2.24.0

2 1

[U-Boot] [PATCH v2 3/3] env: Provide programmatic equivalent to 'setenv -f'
by James Byrne 30 Jan '20

30 Jan '20

Add env_force_set() to provide an equivalent to 'setenv -f' that can be used programmatically. Signed-off-by: James Byrne <james.byrne(a)origamienergy.com> --- Changes in v2: None cmd/nvedit.c | 17 ++++++++++++++--- include/env.h | 13 +++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index b30669a45e..106c69147b 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -241,16 +241,27 @@ static int do_env_update(const char *name, const char *value, int env_flag) return 0; } -int env_set(const char *varname, const char *varvalue) +static int do_programmatic_env_set(const char *varname, const char *varvalue, + int env_flag) { /* before import into hashtable */ if (!(gd->flags & GD_FLG_ENV_READY)) return 1; if (!varvalue || varvalue[0] == '\0') - return do_env_remove(varname, H_PROGRAMMATIC); + return do_env_remove(varname, H_PROGRAMMATIC | env_flag); + + return do_env_update(varname, varvalue, H_PROGRAMMATIC | env_flag); +} + +int env_set(const char *varname, const char *varvalue) +{ + return do_programmatic_env_set(varname, varvalue, 0); +} - return do_env_update(varname, varvalue, H_PROGRAMMATIC); +int env_force_set(const char *varname, const char *varvalue) +{ + return do_programmatic_env_set(varname, varvalue, H_FORCE); } #ifndef CONFIG_SPL_BUILD diff --git a/include/env.h b/include/env.h index b72239f6a5..da54f51805 100644 --- a/include/env.h +++ b/include/env.h @@ -145,6 +145,19 @@ int env_get_yesno(const char *var); */ int env_set(const char *varname, const char *value); +/** + * env_force_set() - forcibly set an environment variable + * + * This sets or deletes the value of an environment variable. It is the same + * as env_set(), except that the variable will be forcibly updated/deleted, + * even if it has access protection flags set. + * + * @varname: Variable to adjust + * @value: Value to set for the variable, or NULL or "" to delete the variable + * @return 0 if OK, 1 on error + */ +int env_force_set(const char *varname, const char *varvalue); + /** * env_get_ulong() - Return an environment variable as an integer value * -- 2.24.0

3 2

Re: U-Boot PCI driver for mx6sxsabresd
by Marek Vasut 30 Jan '20

30 Jan '20

On 1/29/20 2:22 PM, Pedro Jardim wrote: > Hi Marek, Hi, please don't top-post and keep the U-Boot ML on CC. > I've made some changes based on VINING 2000 trying to add the DM > regulator but it was not successful. > The changes that I made were: > > diff --git a/arch/arm/dts/imx6sx-sdb.dtsi b/arch/arm/dts/imx6sx-sdb.dtsi > index da815527a7..86d56fb332 100644 > --- a/arch/arm/dts/imx6sx-sdb.dtsi > +++ b/arch/arm/dts/imx6sx-sdb.dtsi > @@ -78,6 +78,17 @@ > enable-active-high; > }; > > + reg_pcie_gpio: regulator-pcie-gpio { > + compatible = "regulator-fixed"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_pcie_reg>; > + regulator-name = "MPCIE_3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > reg_usb_otg2_vbus: regulator@2 { > compatible = "regulator-fixed"; > reg = <2>; > @@ -154,6 +165,14 @@ > status = "okay"; > }; > > +&pcie { > + vbus-supply = <&reg_pcie_gpio>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_pcie>; > + reset-gpio = <&gpio4 6 GPIO_ACTIVE_HIGH>; > + status = "okay"; > +}; > + > &fec1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_enet1>; > @@ -191,6 +210,10 @@ > status = "okay"; > }; > > +&reg_pcie { > + regulator-always-on; > +}; > + > &i2c4 { > clock-frequency = <100000>; > pinctrl-names = "default"; > @@ -453,6 +476,18 @@ > >; > }; > > + pinctrl_pcie: pciegrp { > + fsl,pins = < > + MX6SX_PAD_ENET1_COL__GPIO2_IO_0 0x10b0 > + >; > + }; > + > + pinctrl_pcie_reg: pciereggrp { > + fsl,pins = < > + MX6SX_PAD_ENET1_CRS__GPIO2_IO_1 0x10b0 > + >; > + }; > + > pinctrl_peri_3v3: peri3v3grp { > fsl,pins = < > MX6SX_PAD_QSPI1A_DATA0__GPIO4_IO_16 > 0x80000000 > diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig > index 5150e3a837..10dc3db726 100644 > --- a/configs/mx6sxsabresd_defconfig > +++ b/configs/mx6sxsabresd_defconfig > @@ -68,3 +68,6 @@ CONFIG_USB_STORAGE=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > CONFIG_VIDEO=y > +CONFIG_DM_PCI=y > +CONFIG_DM_REGULATOR_FIXED=y > +CONFIG_PCIE_IMX_POWER_GPIO=y > +CONFIG_PCIE_IMX_PERST_GPIO=y > diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h > index 55aace1c6e..52aaa82fbc 100644 > --- a/include/configs/mx6sxsabresd.h > +++ b/include/configs/mx6sxsabresd.h > @@ -166,12 +166,10 @@ > #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 > #endif > > -#ifdef CONFIG_CMD_PCI > #define CONFIG_PCI_SCAN_SHOW > #define CONFIG_PCIE_IMX > #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) > #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) > -#endif > > #define CONFIG_IMX_THERMAL > > And inside the board I obtained just the PCI 0 output, seen above: > => pci enum > PCI: Failed autoconfig bar 10 > PCI: Failed autoconfig bar 10 > => pci 1 > Scanning PCI devices on bus 1 > BusDevFun VendorId DeviceId Device Class Sub-Class > _____________________________________________________________ > => pci 0 > Scanning PCI devices on bus 0 > BusDevFun VendorId DeviceId Device Class Sub-Class > _____________________________________________________________ > 00.00.00 0x16c3 0xabcd Bridge device 0x04 > 00.01.00 0x16c3 0xabcd Bridge device 0x04 > > Do you have any suggestions to why it isn't recognizing the pci 1 bus? Maybe you need to power up your PCI device or release it from reset? > > Thanks! > Pedro Jardim > > Em ter., 28 de jan. de 2020 às 14:14, Marek Vasut <marex(a)denx.de> escreveu: >> >> On 1/28/20 6:11 PM, Pedro Jardim wrote: >>> Hi Marek, >> >> Hi, >> >>> I saw your commit c5773ccdca8a ("pci: imx: Add iMX6SX compatible") and >>> I've been trying to convert the PCI driver to DM_PCI on a mx6sxsabresd board. >>> >>> I did the following changes: >>> >>> --git a/arch/arm/dts/imx6sx-sdb.dtsi b/arch/arm/dts/imx6sx-sdb.dtsi >>> index da815527a7..f5b0e9ee3f 100644 >>> --- a/arch/arm/dts/imx6sx-sdb.dtsi >>> +++ b/arch/arm/dts/imx6sx-sdb.dtsi >>> @@ -78,6 +78,17 @@ >>> enable-active-high; >>> }; >>> >>> + reg_pcie_gpio: regulator-pcie-gpio { >>> + compatible = "regulator-fixed"; >>> + pinctrl-names = "default"; >>> + pinctrl-0 = <&pinctrl_pcie_reg>; >>> + regulator-name = "MPCIE_3V3"; >>> + regulator-min-microvolt = <3300000>; >>> + regulator-max-microvolt = <3300000>; >>> + gpio = <&gpio2 1 GPIO_ACTIVE_HIGH>; >>> + enable-active-high; >>> + }; >>> + >>> reg_usb_otg2_vbus: regulator@2 { >>> compatible = "regulator-fixed"; >>> reg = <2>; >>> @@ -154,6 +165,14 @@ >>> status = "okay"; >>> }; >>> >>> +&pcie { >>> + pinctrl-names = "default"; >>> + pinctrl-0 = <&pinctrl_pcie>; >>> + reset-gpio = <&gpio2 0 GPIO_ACTIVE_LOW>; >>> + vpcie-supply = <®_pcie_gpio>; >> ^ >> Is this even a valid DT ? >> >> [...] >> >>> diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig >>> index 5150e3a837..6ce7e01b5f 100644 >>> --- a/configs/mx6sxsabresd_defconfig >>> +++ b/configs/mx6sxsabresd_defconfig >>> @@ -68,3 +68,4 @@ CONFIG_USB_STORAGE=y >>> CONFIG_USB_HOST_ETHER=y >>> CONFIG_USB_ETHER_ASIX=y >>> CONFIG_VIDEO=y >>> +CONFIG_DM_PCI=y >> >> You might need DM regulator somewhere. Take a look at what VINING 2000 >> does there, the PCI worked on that one. >> >>> diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h >>> index 55aace1c6e..52aaa82fbc 100644 >>> --- a/include/configs/mx6sxsabresd.h >>> +++ b/include/configs/mx6sxsabresd.h >>> @@ -166,12 +166,10 @@ >>> #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 >>> #endif >>> >>> -#ifdef CONFIG_CMD_PCI >>> #define CONFIG_PCI_SCAN_SHOW >>> #define CONFIG_PCIE_IMX >>> #define CONFIG_PCIE_IMX_PERST_GPIO IMX_GPIO_NR(2, 0) >>> #define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(2, 1) >>> -#endif >>> >>> #define CONFIG_IMX_THERMAL >>> >>> Which obtained the following output: >>> >>> => pci enum >>> => pci 0 >>> No such bus >>> => pci 1 >>> No such bus >>> >>> Before the DM conversion. Do you have any suggestions as to why the >>> PCI device is not detected after the DM_PCI conversion? Are you able >>> to get i.MX6SX to detect PCI devices when using DM_PCI? >> >> Yep, see above. >> >> -- >> Best regards, >> Marek Vasut -- Best regards, Marek Vasut

2 3

[PATCH v3 3/4] mtd: rawnand: denali_dt: use UCLASS_MTD instead of UCLASS_MISC
by Masahiro Yamada 30 Jan '20

30 Jan '20

UCLASS_MTD is a better fit for NAND drivers. Make NAND_DENALI_DT depend on DM_MTD, which is needed to compile drivers/mtd/mtd-uclass.c Also, make ARCH_UNIPHIER select DM_MTD because all the defconfig of this platform enables NAND_DENALI_DT. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Reviewed-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- Changes in v3: - drop the change fro ARCH_SOCFPGA Changes in v2: - new patch arch/arm/Kconfig | 1 + drivers/mtd/nand/raw/Kconfig | 2 +- drivers/mtd/nand/raw/denali_dt.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 123631516883..f04b6a6d368e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1548,6 +1548,7 @@ config ARCH_UNIPHIER select DM_GPIO select DM_I2C select DM_MMC + select DM_MTD select DM_RESET select DM_SERIAL select DM_USB diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 7814d84ba01d..23201ca72041 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -116,7 +116,7 @@ config NAND_DENALI config NAND_DENALI_DT bool "Support Denali NAND controller as a DT device" select NAND_DENALI - depends on OF_CONTROL && DM + depends on OF_CONTROL && DM_MTD help Enable the driver for NAND flash on platforms using a Denali NAND controller as a DT device. diff --git a/drivers/mtd/nand/raw/denali_dt.c b/drivers/mtd/nand/raw/denali_dt.c index f133dd3840f9..05b9c333e045 100644 --- a/drivers/mtd/nand/raw/denali_dt.c +++ b/drivers/mtd/nand/raw/denali_dt.c @@ -160,7 +160,7 @@ static int denali_dt_probe(struct udevice *dev) U_BOOT_DRIVER(denali_nand_dt) = { .name = "denali-nand-dt", - .id = UCLASS_MISC, + .id = UCLASS_MTD, .of_match = denali_nand_dt_ids, .probe = denali_dt_probe, .priv_auto_alloc_size = sizeof(struct denali_nand_info), @@ -171,7 +171,7 @@ void board_nand_init(void) struct udevice *dev; int ret; - ret = uclass_get_device_by_driver(UCLASS_MISC, + ret = uclass_get_device_by_driver(UCLASS_MTD, DM_GET_DRIVER(denali_nand_dt), &dev); if (ret && ret != -ENODEV) -- 2.17.1

1 0

[U-Boot] [PATCH 0/3] Add reboot mode support
by Han Nandor 30 Jan '20

30 Jan '20

Description ----------- Add support for reboot-mode configuration using GPIOs and RTC SRAM as back-end. Testing ------- Tested on a Zynq based board where device tree was configured to contain the reboot-mode configuration: &amba { status = "okay"; reboot-mode-gpio { compatible = "reboot-mode-gpio"; gpios = <&gpio0 47 GPIO_ACTIVE_LOW>; mode-test = <0x1>; }; reboot-mode-rtc { compatible = "reboot-mode-rtc"; rtc = <&rtc_0>; reg = <0x14 4>; mode-test = <0x21969147>; }; }; In addition to this and not part of this patchset is a change to board.c where GPIO or RTC SRAM backed is selected dynamically at runtime. 1. Test that the reboot mode configured in user-space is read in U-Boot and environment configured: PASS Userspace ~ # reboot test .... [ 177.335936] reboot: Restarting system with command 'test' U-Boot SPL 2019.01 (Mar 29 2019 - 10:44:22 +0000) ... U-Boot> print reboot-mode reboot-mode=test 2. Reset the system using the reset command and stop in U-Boot. 3. Verify that reboot-mode env variable is not configured anymore: PASS U-Boot> print reboot-mode ## Error: "reboot-mode" not defined 4. Toggle the GPIO configured for test mode to active and reset the system with command reset. 5. Stop in U-Boot and check that reboot-mode env variable is configured:PASS U-Boot> print reboot-mode reboot-mode=test Nandor Han (3): reboot-mode: add support for reboot mode control reboot-mode: read the boot mode from GPIOs status reboot-mode: read the boot mode from RTC memory .../reboot-mode/reboot-mode-gpio.txt | 20 +++ .../reboot-mode/reboot-mode-rtc.txt | 22 +++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/reboot-mode/Kconfig | 36 +++++ drivers/reboot-mode/Makefile | 9 ++ drivers/reboot-mode/reboot-mode-gpio.c | 125 +++++++++++++++++ drivers/reboot-mode/reboot-mode-rtc.c | 132 ++++++++++++++++++ drivers/reboot-mode/reboot-mode-uclass.c | 132 ++++++++++++++++++ include/dm/uclass-id.h | 1 + include/reboot-mode/reboot-mode-gpio.h | 32 +++++ include/reboot-mode/reboot-mode-rtc.h | 16 +++ include/reboot-mode/reboot-mode.h | 56 ++++++++ 13 files changed, 584 insertions(+) create mode 100644 doc/device-tree-bindings/reboot-mode/reboot-mode-gpio.txt create mode 100644 doc/device-tree-bindings/reboot-mode/reboot-mode-rtc.txt create mode 100644 drivers/reboot-mode/Kconfig create mode 100644 drivers/reboot-mode/Makefile create mode 100644 drivers/reboot-mode/reboot-mode-gpio.c create mode 100644 drivers/reboot-mode/reboot-mode-rtc.c create mode 100644 drivers/reboot-mode/reboot-mode-uclass.c create mode 100644 include/reboot-mode/reboot-mode-gpio.h create mode 100644 include/reboot-mode/reboot-mode-rtc.h create mode 100644 include/reboot-mode/reboot-mode.h -- 2.20.1

2 4