summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* drivers/rtc: prepare mvrtc for DM conversionChris Packham2018-06-051-18/+39
| | | | | | | | Split the rtc_{get,set,reset} functions so that the bodies can be used in a DM driver. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
* board_f: Only reserve memory for U-Boot if we're going to relocateAlexey Brodkin2018-06-051-13/+15
| | | | | | | | | | | | | In case of no relocation we'll just waste some space at the very end of usable memory area. If target device has very limited amount of memory (for example 256 kB) this loss will be pretty inconvenient. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Heiko Schocher <hs@denx.de> Cc: York Sun <york.sun@nxp.com> Cc: Stefan Roese <sr@denx.de>
* board: STiH410-B2260: Add pxefile_addr_r variableRiku Voipio2018-06-051-0/+1
| | | | | | | Reading doc/README.distro , we see platform needs to set pxefile_addr_r to support distro boot. Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
* menu: fix timeout durationMasahiro Yamada2018-06-052-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For distro-boot, the TIMEOUT directive in the boot script specifies how long to pause in units of 1/10 sec. [1] Commit 8594753ba0a7 ("menu: only timeout when menu is displayed") corrected this by simply dividing the timeout value by 10 in menu_interactive_choice(). I see two problems: - For example, "TIMEOUT 5" should wait for 0.5 sec, but the current implementation cannot handle the granularity of 1/10 sec. In fact, it never breaks because "m->timeout / 10" is zero, which means no timeout. - The menu API is used not only by cmd/pxe.c but also by common/autoboot.c . For the latter case, the unit of the timeout value is _second_ because its default is associated with CONFIG_BOOTDELAY. To fix the first issue, use DIV_ROUND_UP() so that the timeout value is rounded up to the closest integer. For the second issue, move the division to the boundary between cmd/pxe.c and common/menu.c . This is a more desirable place because the comment of struct pxe_menu says: * timeout - time in tenths of a second to wait for a user key-press before * booting the default label. Then, the comment of menu_create() says: * timeout - A delay in seconds to wait for user input. If 0, timeout is * disabled, and the default choice will be returned unless prompt is 1. [1] https://www.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* disk: efi: Correct backing up the MBR boot codeSam Protsenko2018-06-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | In commit e163a931af34 ("cmd: gpt: backup boot code before writing MBR") there was added the procedure for storing old boot code when doing "gpt write". But instead of storing just backup code, the whole MBR was stored, and only specific fields were replaced further, keeping everything else intact. That's obviously not what we want. Fix the code to actually store only old boot code and zero out everything else. This fixes next testing case: => mmc write $loadaddr 0x0 0x7b => gpt write mmc 1 $partitions In case when $loadaddr address and further memory contains 0xff, the board was bricked (ROM-code probably didn't like partition entries that were clobbered with 0xff). With this patch applied, commands above don't brick the board. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> Cc: Alejandro Hernandez <ajhernandez@ti.com> Tested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
* ARM: legoev3: update boot script to load uEnv.txt and .dtbDavid Lechner2018-06-052-19/+65
| | | | | | | This updates the LEGO MINDSTORMS EV3 boot script to try loading a uEnv.txt file and a da850-lego-ev3.dtb device tree during boot. Signed-off-by: David Lechner <david@lechnology.com>
* ARM: legoev3: remove unused configuration optionsDavid Lechner2018-06-051-54/+0
| | | | | | | This removes the unused clock and RAM config options that were cargo- culted when this board was copied from the DA850 EVM. Signed-off-by: David Lechner <david@lechnology.com>
* ARM: legoev3: disable networkingDavid Lechner2018-06-053-8/+2
| | | | | | | This disables networking related items in the config. The EV3 does not have any networking hardware, so this is wasted space. Signed-off-by: David Lechner <david@lechnology.com>
* ARM: legoev3: Move UART enable to early initDavid Lechner2018-06-051-5/+5
| | | | | | | | This moves the UART init for LEGO MINDSTORMS EV3 to board_early_init_f(). Some console messages were not being printed because the UART was not enabled until later in the init process. Signed-off-by: David Lechner <david@lechnology.com>
* ARM: legoev3: increase flash image sizesDavid Lechner2018-06-052-3/+3
| | | | | | | | This increases the kernel image to 4M and the rootfs image to 10M. It is getting hard to get a kernel image to fit in 3M. Signed-off-by: David Lechner <david@lechnology.com>
* Merge git://git.denx.de/u-boot-marvellTom Rini2018-06-0522-43/+612
|\
| * ARM: kirkwood: Enforce size limit for guruplugChris Packham2018-06-051-0/+5
| | | | | | | | | | | | | | | | | | The u-boot binary sits in flash immediately before the environment. Don't allow the binary size to grow into the environment space. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * ARM: kirkwood: Enforce size limit for sheevaplugChris Packham2018-06-051-0/+5
| | | | | | | | | | | | | | | | | | The u-boot binary sits in flash immediately before the environment. Don't allow the binary size to grow into the environment space. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * Enable thumb build to reduce build size of u-boot.kwb.Vagrant Cascadian2018-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | Without this, u-boot.kwb overlaps where the u-boot environment is stored, and updating the environment can break u-boot and vice versa. https://bugs.debian.org/897671 https://lists.denx.de/pipermail/u-boot/2018-May/327497.html Signed-off-by: Vagrant Cascadian <vagrant@debian.org> Signed-off-by: Stefan Roese <sr@denx.de>
| * ARM: kirkwood: SBx81LIFKW: Enable network hardwareChris Packham2018-06-053-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SBx81LIFKW boards connect to the internal chassis management network via a Marvell 88e6097 L2 switch. The chassis connections are direct serdes on ports 8 and 9 with a RGMII interface on port 10 connected to the CPU MAC. For debugging purposes ports 0 and 1 are also taken out to headers on the board. Because the debug interfaces are sometimes connected to with straight ribbon cables we need to run them at 10Mbps. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * ARM: add SBx81LIFKW boardChris Packham2018-06-059-0/+554
| | | | | | | | | | | | | | | | | | | | This is a series of line cards for Allied Telesis's SBx8100 chassis switch. The CPU block is common to the SBx81GS24a, SBx81XS6, SBx81XS16 and SBx81GT40 cards collectively referred to as SBx81LIFKW in u-boot. Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Chris Packham <judge.packham@gmail.com> Signed-off-by: Stefan Roese <sr@denx.de>
| * ARM: kirkwood: remove automatic I2C config if DM_I2C is enabledChris Packham2018-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The mach/config.h file would helpfully define CONFIG_SYS_I2C and CONFIG_SYS_I2C_MVTWSI if CONFIG_CMD_I2C was defined by the board. This conflicts with the way DM_I2C works. As a transitional measure don't automatically define these if CONFIG_DM_I2C is defined. It should be possible to remove this once all kirkwood boards are migrated to DM. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * arm: kirkwood: lsxl: Add SPI driver model supportMichael Walle2018-06-054-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch shows how to enable driver model support for the LS-CHLv2 and LS-XHL boards. There are a couple of open questions: - do I need the u-boot,dm-pre-reloc tags in the device tree? - should mach/config.h define CONFIG_DM_SEQ_ALIAS? - how can we split this patch or are there any other pending patches which does the same and I didn't catch these. This patch is based on the http://git.denx.de/u-boot-marvell.git (master branch) and needs the following patches, which are still pending: https://patchwork.ozlabs.org/patch/909618/ https://patchwork.ozlabs.org/patch/909617/ https://patchwork.ozlabs.org/patch/909973/ Signed-off-by: Michael Walle <michael@walle.cc> Tested-by: Michael Walle <michael@walle.cc> Signed-off-by: Stefan Roese <sr@denx.de>
| * enable CONFIG_DISTRO_DEFAULTS for LS-CHLv2 boardMichael Walle2018-06-051-12/+3
| | | | | | | | | | | | | | | | Synchronize it with the LS-XHL board. Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * arm: mvebu: switch clearfog to use device-tree i2c and gpioJon Nettleton2018-06-054-29/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | This switches the clearfog boards to use DM based gpio and i2c drivers. The io expanders are configured via their device-tree entries. Signed-off-by: Jon Nettleton <jon@solid-run.com> [baruch: add DT i2c aliases] Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * arm: mvebu: enable sata support for clearfogJon Nettleton2018-06-052-0/+11
| | | | | | | | | | | | | | | | | | | | | | The a38x sata interfaces run in ahci mode and can be accessed via the scsi command. Signed-off-by: Jon Nettleton <jon@solid-run.com> [baruch: rebase on current upstream] Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Stefan Roese <sr@denx.de> Signed-off-by: Stefan Roese <sr@denx.de>
| * mvebu: a38x: Force receiver detected on PCIe lanesRabeeh Khoury2018-06-052-0/+3
|/ | | | | | | | | | | | | | Some QCA988x based modules presence is not detected by the SERDES lanes, so force this detection which will trigger the LTSSM state machine to negotiate link. An example of such a card is WLE900VX. Signed-off-by: Rabeeh Khoury <rabeeh@solid-run.com> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Tested-by: Chris Packham <judge.packham@gmail.com> Tested-by: Mario Six <mario.six@gdsys.cc> Signed-off-by: Stefan Roese <sr@denx.de>
* Prepare v2018.07-rc1v2018.07-rc1Tom Rini2018-06-041-2/+2
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* configs: Resync with savedefconfigTom Rini2018-06-04364-805/+738
| | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* MAINTAINERS: Take over DB410c maintainershipRamon Fried2018-06-041-1/+1
| | | | Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
* db410c: Added pre-relocation attribute to pinctrlRamon Fried2018-06-041-0/+8
| | | | | | | | u-boot,dm-pre-reloc was missing from pinctrl and it's children node. causing failure to configure pin mux before relocation. Signed-off-by: Ramon Fried <ramon.fried@gmail.com>
* scripts: mailmapper: SPDX license identifierHeinrich Schuchardt2018-06-041-1/+1
| | | | | | | | | | | If the SPDX license identifier is in the first line the shell does not recognize which interpreter shall be used to execute the script. Cf. https://www.kernel.org/doc/html/v4.16/process/license-rules.html for scripts which require the '#!PATH_TO_INTERPRETER' in the first line (...) the SPDX identifier goes into the second line. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
* Inherit default value for bootdelay from distro_bootcmd on odroid-xu3.Vagrant Cascadian2018-06-041-1/+0
| | | | | | | | | | | | | The default value with distro_bootcmd is 2 seconds, which is reasonably fast, and provides a consistent experience across platforms supporting distro_bootcmd. The current bootdelay value of 0 seconds is a bit challenging to interrupt when desired. Signed-off-by: Vagrant Cascadian <vagrant@debian.org> Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: Marek Vasut <marex@denx.de>
* Set time and umask on multi-dtb fit images to ensure reproducibile builds.Vagrant Cascadian2018-06-041-0/+4
| | | | | | | | | | | | | | | When building compressed (lzop, gzip) multi-dtb fit images, the compression tool may embed the time or umask in the image. Work around this by manually setting the time of the source file using SOURCE_DATE_EPOCH and a hard-coded 0600 umask. With gzip, this could be accomplished by using -n/--no-name, but lzop has no current workaround: https://bugs.debian.org/896520 Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
* xilinx: Sync symbols location in defconfigsMichal Simek2018-06-0434-70/+69
| | | | | | | CONFIG_DEBUG_UART_BASE and CONFIG_DEBUG_UART_CLOCK have changed that's why this sync. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Merge branch 'master' of git://git.denx.de/u-boot-sunxiTom Rini2018-06-0434-580/+1280
|\
| * board: sun50i: Add Amarula A64-Relic initial supportJagan Teki2018-06-044-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amarula A64-Relic is A64 based IoT device, which support - Allwinner A64 Cortex-A53 - Mali-400MP2 GPU - AXP803 PMIC - 1GB DDR3 RAM - 8GB eMMC - AP6330 Wifi/BLE - MIPI-DSI - CSI: OV5640 sensor - USB OTG - 12V DC power supply Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
| * configs: orangepi-prime: Enable USB OTG peripheral modeJagan Teki2018-05-281-0/+1
| | | | | | | | | | | | | | Enable USB_MUSB_GADGET which operate OTG in peripheral mode Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * arm64: allwinner: h5: orangepi-prime: Sync usb otg nodes from LinuxJagan Teki2018-05-281-0/+13
| | | | | | | | | | | | | | | | orangepi-prime has usb otg routed host with either EHCI0/OHCI0 sync the same from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * configs: orangepi-pc2: Enable USB OTG peripheral modeJagan Teki2018-05-281-0/+1
| | | | | | | | | | | | | | Enable USB_MUSB_GADGET which operate OTG in peripheral mode Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * arm64: allwinner: h5: orangepi-pc2: Sync usb otg nodes from LinuxJagan Teki2018-05-281-0/+13
| | | | | | | | | | | | | | | | orangepi-pc2 has usb otg routed host with either EHCI0/OHCI0 sync the same from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * arm64: allwinner: h5: orangepi-pc2: Order nodes in alphabeticJagan Teki2018-05-281-28/+28
| | | | | | | | | | | | | | Order sun50i-h5-orangepi-pc2.dts nodes in alphabetic Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * configs: bananapi-m2-plus: Enable USB OTG peripheral modeJagan Teki2018-05-281-0/+1
| | | | | | | | | | | | | | Enable USB_MUSB_GADGET which operate OTG in peripheral mode Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * ARM: dts: sun8i-h3: bananapi-m2-plus: Sync usb otg nodes from LinuxJagan Teki2018-05-281-0/+13
| | | | | | | | | | | | | | | | Bananapi-m2-plus has usb otg routed host with either EHCI0/OHCI0 sync the same from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * arm64: allwinner: a64: bananapi-m64: Sync usb host nodes from LinuxJagan Teki2018-05-281-0/+16
| | | | | | | | | | | | | | Sync bananapi-m64 usb host nodes from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * ARM: dts: sun8i: a83t: Sync usbphy node from LinuxJagan Teki2018-05-281-0/+20
| | | | | | | | | | | | | | Sync sun8i-a83t usbphy node details from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * configs: bananapi-m64: Enable USB OTG peripheral modeJagan Teki2018-05-281-0/+1
| | | | | | | | | | | | | | Enable USB_MUSB_GADGET which operate OTG in peripheral mode Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * arm64: allwinner: a64: bananapi-m64: Sync usb_otg node from LinuxJagan Teki2018-05-281-0/+10
| | | | | | | | | | | | | | Sync bananapi-m64 usb_otg node from Linux. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * sunxi: h3: Sync OTG and HCI nodes from Linux DTJun Nie2018-05-281-0/+32
| | | | | | | | | | | | | | | | | | Allwinner H3 have a dual-routed USB PHY0 -- routed to either OHCI/EHCI or MUSB controller. Signed-off-by: Jun Nie <jun.nie@linaro.org> Reviewed-by: Jagan Teki <jagan@openedev.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * sunxi: Drop legacy usb_phy.cJagan Teki2018-05-284-436/+0
| | | | | | | | | | | | | | | | | | Allwinner PHY USB code is now part of generic-phy framework, so drop existing legacy handling like arch/arm/mach-sunxi.c and related code areas. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * usb: sunxi: Switch to use generic-phyJagan Teki2018-05-285-39/+133
| | | | | | | | | | | | | | | | | | | | Allwinner USB PHY handling can be done through driver-model generic-phy so add the generic-phy ops to relevant places on host and musb sunxi driver and enable them in respective SOC's. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * phy: sun4i-usb: Add a sunxi specific function for setting squelch-detectJagan Teki2018-05-285-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | The sunxi otg phy has a bug where it wrongly detects a high speed squelch when reset on the root port gets de-asserted with a lo-speed device. The workaround for this is to disable squelch detect before de-asserting reset, and re-enabling it after the reset de-assert is done. Add a sunxi specific phy function to allow the sunxi-musb glue to do this. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * board: sunxi: Use generic-phy for board_usb_cable_connectedJagan Teki2018-05-281-1/+32
| | | | | | | | | | | | | | | | Allwinner PHY USB code is now part of generic-phy framework, so use it in board_usb_cable_connected. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * device-tree-bindings: phy: Sync sun4i-usb-phy bindingsJagan Teki2018-05-281-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | Sync sun4i-usb-phy bindings from Linux, since the drivers/phy/allwinner/phy-sun4i-usb.c follow similar. Sync changes from Linux with below commit: "phy: sun4i-usb: add support for R40 USB PHY" (sha1: f3d96f8d23d8e6d0b7642ee946b9b2ac3418fb4d) Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>
| * phy: sun4i-usb: Add A23 USB PHY configJagan Teki2018-05-281-0/+9
| | | | | | | | | | | | | | Allwinner A23 has 2 USB PHY's and 0x04 has phy ctrl offset. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Jun Nie <jun.nie@linaro.org>