December 2018 - U-Boot

[U-Boot] [PATCH v5 0/4] Stratix10 FPGA reconfiguration support
by chee.hong.ang＠intel.com 17 Dec '18

17 Dec '18

From: "Ang, Chee Hong" <chee.hong.ang(a)intel.com> Summary of v5 changes: - Patch 1/4, 2/4 and 4/4 are unchanged - Patch 3/4: - add arch/arm/mach-socfpga/fpga_device.c for Cyclone/Stratix platforms - remove weak socfpga_fpga_add() v4 patchsets: https://lists.denx.de/pipermail/u-boot/2018-November/347962.html Ang, Chee Hong (4): arm: socfpga: stratix10: Add macros for mailbox's arguments arm: socfpga: stratix10: Add Stratix 10 FPGA Reconfiguration Driver arm: socfpga: stratix10: Add Stratix10 FPGA into FPGA device table arm: socfpga: stratix10: Enable Stratix10 FPGA Reconfiguration arch/arm/mach-socfpga/Makefile | 4 + arch/arm/mach-socfpga/fpga_device.c | 59 +++++ arch/arm/mach-socfpga/include/mach/fpga_device.h | 15 ++ arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 6 + arch/arm/mach-socfpga/include/mach/misc.h | 6 - arch/arm/mach-socfpga/misc.c | 31 --- arch/arm/mach-socfpga/misc_arria10.c | 1 + arch/arm/mach-socfpga/misc_gen5.c | 1 + arch/arm/mach-socfpga/misc_s10.c | 3 + configs/socfpga_stratix10_defconfig | 1 + drivers/fpga/Kconfig | 11 + drivers/fpga/Makefile | 1 + drivers/fpga/altera.c | 6 + drivers/fpga/stratix10.c | 288 +++++++++++++++++++++++ include/altera.h | 8 + 15 files changed, 404 insertions(+), 37 deletions(-) create mode 100644 arch/arm/mach-socfpga/fpga_device.c create mode 100644 arch/arm/mach-socfpga/include/mach/fpga_device.h create mode 100644 drivers/fpga/stratix10.c -- 2.7.4

3 10

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 17 Dec '18

17 Dec '18

Hello Tom, please pull from u-boot-i2c.git master pull request contains patch from Jean-Jacques which fixes a regression on NVIDIA Jetson TX2 board, Stephen had reported. The following changes since commit ee168783ae889cf449cee36cc1e51e108a210ed4: travis: Add check for configs without MAINTAINERS entries (2018-12-10 17:21:36 -0500) are available in the Git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 22ecff594d9248f0a63e191e31d48f417a946d75: i2c: tegra: Fix regression by implementing a dummy probe_chip() callback (2018-12-12 06:06:14 +0100) ---------------------------------------------------------------- Jean-Jacques Hiblot (1): i2c: tegra: Fix regression by implementing a dummy probe_chip() callback drivers/i2c/tegra186_bpmp_i2c.c | 7 +++++++ 1 file changed, 7 insertions(+) Travis builds fine: https://travis-ci.org/hsdenx/u-boot-i2c/builds/466842438 bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

3 3

[U-Boot] [PATCH] Makefile: output migration warnings to stderr
by Chris Packham 17 Dec '18

17 Dec '18

Output the device model migration warnings to stderr. This allows tools like buildman to pick them up rather than suppressing them along with the normal build output on stdout. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- One odd behaviour is that when a board has multiple warnings the header/trailer lines (==...) don't appear when run under buildman. I assume there is some de-duplication going on. Makefile | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 5683714947f2..032dba5427c2 100644 --- a/Makefile +++ b/Makefile @@ -913,47 +913,47 @@ cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ all: $(ALL-y) cfg ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) - @echo "===================== WARNING ======================" - @echo "This board uses CONFIG_DM_I2C_COMPAT. Please remove" - @echo "(possibly in a subsequent patch in your series)" - @echo "before sending patches to the mailing list." - @echo "====================================================" + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board uses CONFIG_DM_I2C_COMPAT. Please remove" + @echo >&2 "(possibly in a subsequent patch in your series)" + @echo >&2 "before sending patches to the mailing list." + @echo >&2 "====================================================" endif ifeq ($(CONFIG_MMC),y) ifneq ($(CONFIG_DM_MMC)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) - @echo "===================== WARNING ======================" - @echo "This board does not use CONFIG_DM_MMC. Please update" - @echo "the board to use CONFIG_DM_MMC before the v2019.04 release." - @echo "Failure to update by the deadline may result in board removal." - @echo "See doc/driver-model/MIGRATION.txt for more info." - @echo "====================================================" + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_MMC. Please update" + @echo >&2 "the board to use CONFIG_DM_MMC before the v2019.04 release." + @echo >&2 "Failure to update by the deadline may result in board removal." + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" endif endif ifeq ($(CONFIG_USB),y) ifneq ($(CONFIG_DM_USB)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) - @echo "===================== WARNING ======================" - @echo "This board does not use CONFIG_DM_USB. Please update" - @echo "the board to use CONFIG_DM_USB before the v2019.07 release." - @echo "Failure to update by the deadline may result in board removal." - @echo "See doc/driver-model/MIGRATION.txt for more info." - @echo "====================================================" + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_USB. Please update" + @echo >&2 "the board to use CONFIG_DM_USB before the v2019.07 release." + @echo >&2 "Failure to update by the deadline may result in board removal." + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" endif endif ifeq ($(CONFIG_LIBATA)$(CONFIG_DM_SCSI)$(CONFIG_MVSATA_IDE),y) - @echo "===================== WARNING ======================" - @echo "This board does not use CONFIG_DM_SCSI. Please update" - @echo "the storage controller to use CONFIG_DM_SCSI before the v2019.07 release." - @echo "Failure to update by the deadline may result in board removal." - @echo "See doc/driver-model/MIGRATION.txt for more info." - @echo "====================================================" + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_SCSI. Please update" + @echo >&2 "the storage controller to use CONFIG_DM_SCSI before the v2019.07 release." + @echo >&2 "Failure to update by the deadline may result in board removal." + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" endif ifeq ($(CONFIG_OF_EMBED),y) - @echo "===================== WARNING ======================" - @echo "CONFIG_OF_EMBED is enabled. This option should only" - @echo "be used for debugging purposes. Please use" - @echo "CONFIG_OF_SEPARATE for boards in mainline." - @echo "See doc/README.fdt-control for more info." - @echo "====================================================" + @echo >&2 "===================== WARNING ======================" + @echo >&2 "CONFIG_OF_EMBED is enabled. This option should only" + @echo >&2 "be used for debugging purposes. Please use" + @echo >&2 "CONFIG_OF_SEPARATE for boards in mainline." + @echo >&2 "See doc/README.fdt-control for more info." + @echo >&2 "====================================================" endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG -- 2.19.2

2 1

[U-Boot] [PATCH V2] Restore compatibility of image type IDs
by Stefano Babic 17 Dec '18

17 Dec '18

Commit a2b96ece5be146f4995d737f047e5bbb76079b8f breaks the enumeration of the Image Types. New image types can be appended, but they cannot be inserted in the list else backward compatibility is broken. This restores the images types as before 2018.11 and move i.MX8 related images at the end. Signed-off-by: Robert Berger <robert.berger(a)ReliableEmbeddedSystems.com> Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Tom Rini <trini(a)konsulko.com> --- V2: - inprove comments in the structure to make clear that just append is allowed. include/image.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/image.h b/include/image.h index 7ce9670c20..5989c14273 100644 --- a/include/image.h +++ b/include/image.h @@ -126,7 +126,8 @@ enum ih_category { * Operating System Codes * * The following are exposed to uImage header. - * Do not change values for backward compatibility. + * New IDs *MUST* be appended at the end of the list and *NEVER* + * inserted for backward compatibility. */ enum { IH_OS_INVALID = 0, /* Invalid OS */ @@ -164,7 +165,8 @@ enum { * CPU Architecture Codes (supported by Linux) * * The following are exposed to uImage header. - * Do not change values for backward compatibility. + * New IDs *MUST* be appended at the end of the list and *NEVER* + * inserted for backward compatibility. */ enum { IH_ARCH_INVALID = 0, /* Invalid CPU */ @@ -237,7 +239,8 @@ enum { * as command interpreter (=> Shell Scripts). * * The following are exposed to uImage header. - * Do not change values for backward compatibility. + * New IDs *MUST* be appended at the end of the list and *NEVER* + * inserted for backward compatibility. */ enum { @@ -252,7 +255,6 @@ enum { IH_TYPE_FLATDT, /* Binary Flat Device Tree Blob */ IH_TYPE_KWBIMAGE, /* Kirkwood Boot Image */ IH_TYPE_IMXIMAGE, /* Freescale IMXBoot Image */ - IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */ IH_TYPE_UBLIMAGE, /* Davinci UBL Image */ IH_TYPE_OMAPIMAGE, /* TI OMAP Config Header Image */ IH_TYPE_AISIMAGE, /* TI Davinci AIS Image */ @@ -280,6 +282,7 @@ enum { IH_TYPE_STM32IMAGE, /* STMicroelectronics STM32 Image */ IH_TYPE_SOCFPGAIMAGE_V1, /* Altera SOCFPGA A10 Preloader */ IH_TYPE_IMX8MIMAGE, /* Freescale IMX8MBoot Image */ + IH_TYPE_IMX8IMAGE, /* Freescale IMX8Boot Image */ IH_TYPE_MTKIMAGE, /* MediaTek BootROM loadable Image */ IH_TYPE_COUNT, /* Number of image types */ @@ -289,7 +292,8 @@ enum { * Compression Types * * The following are exposed to uImage header. - * Do not change values for backward compatibility. + * New IDs *MUST* be appended at the end of the list and *NEVER* + * inserted for backward compatibility. */ enum { IH_COMP_NONE = 0, /* No Compression Used */ -- 2.17.1

2 1

[U-Boot] Please pull u-boot-rockchip
by Philipp Tomsich 17 Dec '18

17 Dec '18

Tom, Here’s a few minor fixes for RC2. I am still waiting for a final revision on a somewhat involved bug-fix for our RK3399-Q7, which is held up by my colleagues also introducing changes to pinctrl to ensure a PWM regulator can be auto-set. The all-green Travis report for these changes is at https://travis-ci.org/ptomsich/u-boot-rockchip/builds/468541679 Thanks, Philipp. The following changes since commit 8fc26fce41592175ae004514e431e68a9dd60671: Merge tag 'dm-pull-14dec18' of git://git.denx.de/u-boot-dm (2018-12-14 14:18:47 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git tags/for-master-20181216 for you to fetch changes up to e11ef3d26eff8d14a11f89b9bdc20471b425d2d7: ARM: rockchip: Add rv1108-elgin-r1 board support (2018-12-16 01:30:11 +0100) ---------------------------------------------------------------- Improvements and fixes or u-boot-rockchip: - new board: adds rv1108-elgin-r1 board support - rk3288-evb: dts: remove 'vmmc' from emmc node - rk3399-puma: dts: remove obsolete DTS node 'vcc5v0_host' ---------------------------------------------------------------- Christoph Muellner (1): rockchip: rk3399-puma: Remove obsolete DTS node 'vcc5v0_host'. Kever Yang (1): rockchip: rk3288-evb: dts: remove 'vmmc' from emmc node Otavio Salvador (1): ARM: rockchip: Add rv1108-elgin-r1 board support arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-evb.dtsi | 2 - arch/arm/dts/rk3399-puma.dtsi | 12 +----- arch/arm/dts/rv1108-elgin-r1.dts | 48 +++++++++++++++++++++ arch/arm/mach-rockchip/rv1108/Kconfig | 6 +++ board/elgin/elgin_rv1108/Kconfig | 15 +++++++ board/elgin/elgin_rv1108/MAINTAINERS | 6 +++ board/elgin/elgin_rv1108/Makefile | 7 ++++ board/elgin/elgin_rv1108/elgin_rv1108.c | 74 +++++++++++++++++++++++++++++++++ configs/elgin-rv1108_defconfig | 58 ++++++++++++++++++++++++++ include/configs/elgin_rv1108.h | 13 ++++++ 11 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 arch/arm/dts/rv1108-elgin-r1.dts create mode 100644 board/elgin/elgin_rv1108/Kconfig create mode 100644 board/elgin/elgin_rv1108/MAINTAINERS create mode 100644 board/elgin/elgin_rv1108/Makefile create mode 100644 board/elgin/elgin_rv1108/elgin_rv1108.c create mode 100644 configs/elgin-rv1108_defconfig create mode 100644 include/configs/elgin_rv1108.h

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 17 Dec '18

17 Dec '18

As much as I hate sending so many patches after RC, apparently this is second half of USB gadget DM conversion, so be it. The following changes since commit d117d8f19b0625f88309e47a8a32c2faa384dddc: Merge branch 'master' of git://git.denx.de/u-boot-i2c (2018-12-13 09:36:55 -0500) are available in the Git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 46a3f276549f3e5720b6e80278cda354c7fa859f: usb: musb-new: sunxi: Fix null pointer access (2018-12-14 17:59:10 +0100) ---------------------------------------------------------------- Adam Ford (2): usb: musb: Remove Legacy CONFIG_USB_DAVINCI usb: musb: Remove legacy CONFIG_USB_DA8XX Jean-Jacques Hiblot (20): usb: dwc3-generic: make it compatible with "ti, keystone-dwc3" board: ks2_evm: Enable the USB clocks if DM_USB is used ARM: dts: k2g-evm: enable USB0 and USB1 PHY: Add phy driver for the keystone USB PHY usb: host: replace xhci-keystone driver by the generic dwc3 driver configs: k2g_evm: Enable DFU on K2G EVM spl: drivers: Link usb common library to SPL if USB gadget is enabled spl: net: dm: usb: bind the gadget before attempting to load the image phy: omap_usb2: Add support for am437x dwc3-generic: Add support for the am437x board: ti: am43xx: turn on USB clocks dts: Add a u-boot specific dtsi file for the am4372 dts: am4372: Enable USB1 in SPL configs: am43xx_evm: Enable DM_USB and DM_USB_GADGET configs: am43xx: Enable RNDIS support in SPL usb: musb-new: Allow the diver not to use the set_phy_power() callback usb: musb-new: Add support for DM_USB arm: am33xx: Register USB controllers if DM_USB is used but not OF_CONTROL configs: am335x_evm: Do not disable DM_USB in SPL configs: am335x_boneblack_vboot: enable DM_USB and RNDIS boot in SPl Lukasz Majewski (1): usb: composite: Move bitmap related operations to ./include/linux/bitmap.h Martyn Welch (1): usb: Don't enable CONFIG_SPL_DM_USB for non-DM SPL Petr Štetiar (1): usb: gadget: f_sdp: Provide filesize env variable for downloaded images Siva Durga Prasad Paladugu (1): usb: composite: Fix max packet size for USB3.0 Stefan Mavrodiev (1): usb: musb-new: sunxi: Fix null pointer access arch/arm/dts/am4372-generic-u-boot.dtsi | 2 ++ arch/arm/dts/am4372-u-boot.dtsi | 40 +++++++++++++++++++++++++ arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 2 ++ arch/arm/dts/am437x-idk-evm-u-boot.dtsi | 2 ++ arch/arm/dts/am437x-sk-evm-u-boot.dtsi | 2 ++ arch/arm/dts/keystone-k2g-evm.dts | 28 +++++++++++++++++ arch/arm/dts/keystone-k2g.dtsi | 56 ++++++++++++++++++++++++++++++++++ arch/arm/include/asm/omap_musb.h | 8 +++++ arch/arm/mach-omap2/am33xx/board.c | 58 +++++++++++++++++++++++++++++++----- board/ti/am43xx/board.c | 22 ++++++++++++++ board/ti/ks2_evm/board.c | 12 ++++++++ common/Makefile | 3 ++ common/spl/spl_net.c | 4 ++- configs/am335x_boneblack_vboot_defconfig | 10 +++++++ configs/am43xx_evm_defconfig | 19 ++++++++++++ configs/k2e_evm_defconfig | 7 +++++ configs/k2e_hs_evm_defconfig | 7 +++++ configs/k2g_evm_defconfig | 12 ++++++++ configs/k2g_hs_evm_defconfig | 12 ++++++++ configs/k2hk_evm_defconfig | 7 +++++ configs/k2hk_hs_evm_defconfig | 7 +++++ configs/k2l_evm_defconfig | 7 +++++ configs/k2l_hs_evm_defconfig | 7 +++++ drivers/Makefile | 1 + drivers/phy/Kconfig | 10 +++++++ drivers/phy/Makefile | 1 + drivers/phy/keystone-usb-phy.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/phy/omap-usb2-phy.c | 45 +++++++++++++++++++++------- drivers/usb/Kconfig | 2 +- drivers/usb/dwc3/dwc3-generic.c | 2 ++ drivers/usb/dwc3/gadget.c | 1 - drivers/usb/dwc3/ti_usb_phy.c | 1 - drivers/usb/eth/r8152.c | 1 - drivers/usb/gadget/at91_udc.c | 1 - drivers/usb/gadget/atmel_usba_udc.c | 1 - drivers/usb/gadget/composite.c | 17 +++++++++-- drivers/usb/gadget/dwc2_udc_otg.c | 1 - drivers/usb/gadget/dwc2_udc_otg_phy.c | 1 - drivers/usb/gadget/dwc2_udc_otg_priv.h | 1 - drivers/usb/gadget/f_mass_storage.c | 2 +- drivers/usb/gadget/f_sdp.c | 5 ++++ drivers/usb/gadget/pxa25x_udc.c | 1 - drivers/usb/host/Makefile | 1 - drivers/usb/host/xhci-keystone.c | 240 -------------------------------------------------------------------------------------------------------------------------------------------------- drivers/usb/musb-new/am35x.c | 8 ++--- drivers/usb/musb-new/musb_dsps.c | 8 ++--- drivers/usb/musb-new/musb_gadget.c | 11 +++++++ drivers/usb/musb-new/musb_uboot.c | 4 +-- drivers/usb/musb-new/sunxi.c | 8 +++-- drivers/usb/musb-new/ti-musb.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- drivers/usb/musb/Kconfig | 7 ----- drivers/usb/musb/Makefile | 2 -- drivers/usb/musb/da8xx.c | 127 ----------------------------------------------------------------------------- drivers/usb/musb/davinci.c | 123 --------------------------------------------------------------------------- drivers/usb/musb/davinci.h | 73 --------------------------------------------- drivers/usb/musb/musb_udc.c | 2 -- include/configs/am335x_evm.h | 1 - include/configs/ti_armv7_keystone2.h | 17 +++++++---- include/linux/bitmap.h | 23 ++++++++++++++ include/linux/types.h | 3 ++ include/linux/usb/composite.h | 2 +- include/usb/lin_gadget_compat.h | 35 ---------------------- 62 files changed, 704 insertions(+), 709 deletions(-) create mode 100644 arch/arm/dts/am4372-u-boot.dtsi create mode 100644 drivers/phy/keystone-usb-phy.c delete mode 100644 drivers/usb/host/xhci-keystone.c delete mode 100644 drivers/usb/musb/da8xx.c delete mode 100644 drivers/usb/musb/davinci.c delete mode 100644 drivers/usb/musb/davinci.h create mode 100644 include/linux/bitmap.h delete mode 100644 include/usb/lin_gadget_compat.h

2 1

[U-Boot] [PATCH v2] syscon: update syscon_node_to_regmap to use the DM functions
by Patrick Delaunay 17 Dec '18

17 Dec '18

+ Update the function syscon_node_to_regmap() to force bound on syscon uclass and directly use the list of device from DM. + Remove the static list syscon_list. This patch avoid issue (crash) when syscon_node_to_regmap() is called before and after reallocation (list content is invalid). Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Hi This patch is a modified (after Simon Glass review) and rebased version on v2018.11-rc3 for [U-Boot] syscon: reset node list syscon_list after relocation http://patchwork.ozlabs.org/patch/983139/ This patch correct a crash see on v2018.11-rc1 with my board stm32mp1 for the command "reset", reproduced on v2018.11-rc3. The crash is a side effect of 2 patches 1f6ca3f42f6edf143473159297f4c515b1cf36f6 sysreset: syscon: update regmap access to syscon 23471aed5c33e104d6fa64575932577618543bec board_f: Add reset status printing With the first patch the syscon_node_to_regmap() is called each time that the class sysreset_syscon is probed. => in v2018.09 probe is done only when reset is requested NB: for stm32mp1, the node rcc_reboot in tagged pre-relocated to support reset in pre-reloc phases (allow panic). With the second patch, U-Boot probes all the sysreset uclass in preloc phase to allow to print the reset status, and the list is initialized in board_f / pre-reloc: -> print_resetinfo --> uclass_first_device_err(UCLASS_SYSRESET, &dev); ---> syscon_reboot_probe() ----> syscon_node_to_regmap(node) -----> of_syscon_register() -------> list_add_tail(&syscon->list, &syscon_list); During relocation, the content of syscon_list (static) is updated but the list use pointers allocated by malloc in pre-reloc phasis And when I execute the reset command -> do_reset() --> reset_cpu() ---> sysreset_walk_halt(SYSRESET_COLD); ----> loop on device UCLASS_SYSRESET -----> syscon_reboot_probe() ------> syscon_node_to_regmap(node) -------> list_for_each_entry(entry, &syscon_list, list) I have a crash here because the pointer syscon_list.next is invalid. This patch solves the issue by using DM list for syscon uclass. Tested on my board, the initial issue is solved and I check the behavior with dm_dump_all(): the RCC driver is not binded/probed as syscon uclass by default (checked with dm tree) and correctly bounded and probed when it is necessary (before relocation: print_resetinfo() or after relocation for command reset). Regards Patrick Changes in v2: - minor update after Simon review (remove variable ofnode and add one comment) drivers/core/syscon-uclass.c | 55 ++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 303e166..3864f13 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -123,52 +123,31 @@ U_BOOT_DRIVER(generic_syscon) = { * The syscon node can be bound to another driver, but still works * as a syscon provider. */ -static LIST_HEAD(syscon_list); - -struct syscon { - ofnode node; - struct regmap *regmap; - struct list_head list; -}; - -static struct syscon *of_syscon_register(ofnode node) +struct regmap *syscon_node_to_regmap(ofnode node) { - struct syscon *syscon; + struct udevice *dev, *parent; int ret; + if (!uclass_get_device_by_ofnode(UCLASS_SYSCON, node, &dev)) + return syscon_get_regmap(dev); + if (!ofnode_device_is_compatible(node, "syscon")) return ERR_PTR(-EINVAL); - syscon = malloc(sizeof(*syscon)); - if (!syscon) - return ERR_PTR(-ENOMEM); + /* bound to driver with same ofnode or to root if not found */ + if (device_find_global_by_ofnode(node, &parent)) + parent = dm_root(); - ret = regmap_init_mem(node, &syscon->regmap); - if (ret) { - free(syscon); + /* force bound to syscon class */ + ret = device_bind_driver_to_node(parent, "syscon", + ofnode_get_name(node), + node, &dev); + if (ret) return ERR_PTR(ret); - } - - list_add_tail(&syscon->list, &syscon_list); - - return syscon; -} -struct regmap *syscon_node_to_regmap(ofnode node) -{ - struct syscon *entry, *syscon = NULL; - - list_for_each_entry(entry, &syscon_list, list) - if (ofnode_equal(entry->node, node)) { - syscon = entry; - break; - } - - if (!syscon) - syscon = of_syscon_register(node); - - if (IS_ERR(syscon)) - return ERR_CAST(syscon); + ret = device_probe(dev); + if (ret) + return ERR_PTR(ret); - return syscon->regmap; + return syscon_get_regmap(dev); } -- 2.7.4

3 2

[U-Boot] [PATCH v1] tools: mtk_image: replace strncpy(d, s, sizeof(d)) with snprintf()
by Andy Shevchenko 17 Dec '18

17 Dec '18

Starting from version 8 the GCC, i.e. C compiler, starts complaining about possible '\0' terminator loss or, as in this case, garbage copy. In function ‘mtk_image_set_gen_header’, inlined from ‘mtk_image_set_header’ at tools/mtk_image.c:733:3: tools/mtk_image.c:659:2: warning: ‘strncpy’ specified bound 12 equals destination size [-Wstringop-truncation] strncpy(hdr->boot.name, bootname, sizeof(hdr->boot.name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In function ‘mtk_brom_parse_imagename’, inlined from ‘mtk_image_check_params’ at tools/mtk_image.c:388:9: tools/mtk_image.c:325:5: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation] strncpy(lk_name, val, sizeof(lk_name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Replace it with snprintf() to tell compiler how much room we have in the destination buffer for source string. Fixes: 3b975a147c3c ("tools: MediaTek: add MTK boot header generation to mkimage") Cc: Ryder Lee <ryder.lee(a)mediatek.com> Cc: Weijie Gao <weijie.gao(a)mediatek.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- tools/mtk_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/mtk_image.c b/tools/mtk_image.c index 2706d2de32..2ca519483d 100644 --- a/tools/mtk_image.c +++ b/tools/mtk_image.c @@ -322,7 +322,7 @@ static int mtk_brom_parse_imagename(const char *imagename) lk = val; if (!strcmp(key, "lkname")) - strncpy(lk_name, val, sizeof(lk_name)); + snprintf(lk_name, sizeof(lk_name), "%s", val); } if (next) @@ -656,7 +656,7 @@ static void mtk_image_set_gen_header(void *ptr, off_t filesize, bootname = SDMMC_BOOT_NAME; /* Generic device header */ - strncpy(hdr->boot.name, bootname, sizeof(hdr->boot.name)); + snprintf(hdr->boot.name, sizeof(hdr->boot.name), "%s", bootname); hdr->boot.version = cpu_to_le32(1); hdr->boot.size = cpu_to_le32(sizeof(hdr->boot)); -- 2.19.2

3 2

[U-Boot] [PATCH] serial: serial_stm32: Add reset support
by Patrice Chotard 17 Dec '18

17 Dec '18

In some cases, UART is configured by early boot stage. To be sure of the initial state of UART and to avoid spurious chars on console, reset the serial block before configuring it. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- drivers/serial/serial_stm32.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index 31b43ee88dd7..e31c87b9ac5a 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -7,6 +7,7 @@ #include <common.h> #include <clk.h> #include <dm.h> +#include <reset.h> #include <serial.h> #include <watchdog.h> #include <asm/io.h> @@ -171,6 +172,7 @@ static int stm32_serial_probe(struct udevice *dev) { struct stm32x7_serial_platdata *plat = dev_get_platdata(dev); struct clk clk; + struct reset_ctl reset; int ret; plat->uart_info = (struct stm32_uart_info *)dev_get_driver_data(dev); @@ -185,6 +187,13 @@ static int stm32_serial_probe(struct udevice *dev) return ret; } + ret = reset_get_by_index(dev, 0, &reset); + if (!ret) { + reset_assert(&reset); + udelay(2); + reset_deassert(&reset); + } + plat->clock_rate = clk_get_rate(&clk); if (plat->clock_rate < 0) { clk_disable(&clk); -- 1.9.1

3 2

[U-Boot] [PATCH] poplar: fix boot failure caused by serial driver change
by Shawn Guo 17 Dec '18

17 Dec '18

Commit 4687919684e0 ("serial: Remove DM_FLAG_PRE_RELOC flag in various drivers") essentially drops flag DM_FLAG_PRE_RELOC from serial_pl01x driver for Poplar platform, because the platform falls into the following strategy category made by the commit. Surround DM_FLAG_PRE_RELOC flag with OF_CONTROL check, for drivers that support both statically declared devices and configuration from device tree Before the commit lands, Poplar platform works by statically declaring pl011 serial device via U_BOOT_DEVICE() with DM_FLAG_PRE_RELOC flag set in the driver. But since Poplar also supports device configuration from device tree, the commit practically drops the flag for Poplar, and hence breaks the platform from booting. This patch changes platform code and device tree to initiate pl011 serial device from device tree rather than static declaration, so that above strategy about DM_FLAG_PRE_RELOC applies to Poplar, and therefore the reported boot failure gets fixed. Reported-by: Igor Opaniuk <igor.opaniuk(a)linaro.org> Fixes: 4687919684e0 ("serial: Remove DM_FLAG_PRE_RELOC flag in various drivers") Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- arch/arm/dts/hi3798cv200-u-boot.dtsi | 10 ++-------- board/hisilicon/poplar/poplar.c | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/hi3798cv200-u-boot.dtsi b/arch/arm/dts/hi3798cv200-u-boot.dtsi index 709ae1cbc9f3..7844c5208c5d 100644 --- a/arch/arm/dts/hi3798cv200-u-boot.dtsi +++ b/arch/arm/dts/hi3798cv200-u-boot.dtsi @@ -17,12 +17,6 @@ }; &uart0 { - status = "disabled"; + clock = <75000000>; + status = "okay"; }; - -/{ - chosen { - stdout-path = ""; - }; -}; - diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 9e8eac78388b..8adc750962a1 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -35,6 +35,7 @@ static struct mm_region poplar_mem_map[] = { struct mm_region *mem_map = poplar_mem_map; +#if !CONFIG_IS_ENABLED(OF_CONTROL) static const struct pl01x_serial_platdata serial_platdata = { .base = REG_BASE_UART0, .type = TYPE_PL010, @@ -45,6 +46,7 @@ U_BOOT_DEVICE(poplar_serial) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#endif int checkboard(void) { -- 2.18.0

4 3