summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rockchip: rk3288: provide ${fdtfile}Heinrich Schuchardt2018-04-251-0/+1
| | | | | | | | | | | All rk3288 default configs define CONFIG_DEFAULT_DEVICE_TREE. So we can use it to define ${fdtfile} in rk3288_common.h. This variable is needed by the distro boot command. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* rockchip: clk: rk3288: add clk_enable function and support USB HOST0/HSICWadim Egorov2018-04-251-0/+13
| | | | | | | | | | | | | | | The generic ehci-driver (ehci-generic.c) will try to enable the clocks listed in the DTSI. If this fails (e.g. due to clk_enable not being implemented in a driver and -ENOSYS being returned by the clk-uclass), the driver will bail our and print an error message. This implements a minimal clk_enable for the RK3288 and supports the clocks mandatory for the EHCI controllers; as these are enabled by default we simply return success. Signed-off-by: Wadim Egorov <w.egorov@phytec.de> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* Merge git://git.denx.de/u-boot-videoTom Rini2018-04-243-1/+1
|\
| * video-uclass: Fix logical-not-parentheses warningTom Rini2018-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With clang-4.0 and later we see: warning: logical not is only applied to the left hand side of this bitwise operator [-Wlogical-not-parentheses] if ((!gd->flags & GD_FLG_RELOC)) ^ ~ And while the compiler suggests adding parenthesis around gd->flags, a reading of the code says that we want to know when GD_FLG_RELOC is not set and then return. Cc: Simon Glass <sjg@chromium.org> Cc: Anatolij Gustschin <agust@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
| * treewide: fix up files incorrectly marked executableFabio Estevam2018-04-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by the following kernel commit: "commit 90fda63fa1156ec1bcfd7f9ca384cec221f70a21 Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Sat Apr 7 13:31:23 2018 -0700 treewide: fix up files incorrectly marked executable Joe Perches noted that we have a few source files that for some inexplicable reason (read: I'm too lazy to even go look at the history) are marked executable: drivers/gpu/drm/amd/amdgpu/vce_v4_0.c drivers/net/ethernet/cadence/macb_ptp.c A simple git command line to show executable C/asm/header files is this: git ls-files -s '*.[chsS]' | grep '^100755' and then you can fix them up with scripting by just feeding that output into: | cut -f2 | xargs chmod -x and commit it. Which is exactly what this commit does. Reported-by: Joe Perches <joe@perches.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>" Do the same in the U-Boot source tree. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
* | Merge tag 'signed-efi-2018.05' of git://github.com/agraf/u-bootTom Rini2018-04-2313-36/+556
|\ \ | | | | | | | | | | | | | | | | | | | | | Patch queue for efi - 2018-04-23 Some last minute fixes for 2018.05. Most of them are minor fixes. On top we have some functional improvements for the device path logic which should also help us be more compatible.
| * | efi_selftest: test EFI_DEVICE_PATH_UTILITIES_PROTOCOLHeinrich Schuchardt2018-04-232-0/+287
| | | | | | | | | | | | | | | | | | | | | Provide unit tests for the EFI_DEVICE_PATH_UTILITIES_PROTOCOL. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: complete EFI_DEVICE_PATH_UTILITIES_PROTOCOLHeinrich Schuchardt2018-04-234-10/+180
| | | | | | | | | | | | | | | | | | | | | | | | The missing services of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL are implemented. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: correcty determine total device path lengthHeinrich Schuchardt2018-04-233-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device paths may consist of multiple instances. Up to now we have only considered the size of the first instance. For the services of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL in most cases the total length of the device path is relevant. So let's rename efi_dp_size() to efi_dp_instance_size() and create a new function efi_dp_size() that calculates the total device path length. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: correctly determine length of empty device pathHeinrich Schuchardt2018-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efi_dp_size() is meant to return the device path length without the end node. The length of a device path containing only an end node was incorrectly reported as 4. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: fix AppendDevicePathHeinrich Schuchardt2018-04-231-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic of the AppendDevicePath service of the EFI_DEVICE_PATH_UTILITIES_PROTOCOL is incorrectly implemented: * if both paths are NULL an end node has to be returned * if both paths are not NULL the end node of the second device path has to be kept Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: implement CreateDeviceNodeHeinrich Schuchardt2018-04-233-2/+35
| | | | | | | | | | | | | | | | | | | | | Implement the CreateDeviceNode service of the device path utility protocol. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_selftest: fix typo in efi_selftest_devicepath.cHeinrich Schuchardt2018-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | %s/provice/provide/ Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_selftest: do not execute test if setup failedHeinrich Schuchardt2018-04-232-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Executing a test after failed setup may lead to unexpected behavior like an illegal memory access. So after a setup failure we should skip to teardown. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | efi_loader: no support for ARMV7_NONSEC=yHeinrich Schuchardt2018-04-232-0/+4
| | | | | | | | | | | | | | | | | | | | | We do not support bootefi booting ARMv7 in non-secure mode. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
| * | log: fix typo LOGL_EFIHeinrich Schuchardt2018-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation the EFI log category is called LOGC_EFI. All other categories start with LOGC_. So let's fix it. Fixes: 1973b381a1b3 ("log: add category LOGC_EFI") Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Alexander Graf <agraf@suse.de>
* | | mmc: Staticize sd_select_bus_widthMarek Vasut2018-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Staticize the function since it's only used in mmc.c . Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Tom Rini <trini@konsulko.com>
* | | Merge git://git.denx.de/u-boot-uniphierTom Rini2018-04-236-41/+55
|\ \ \
| * | | ARM: uniphier: move SPL stack addressMasahiro Yamada2018-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the address region, 0xf8000 - 0x100000, is used for SPL stack for the 32bit SoCs. Because the U-Boot proper image starts from 0x70000, the maximum size of the U-Boot proper image is 544KB (0x70000 - 0xf8000) for the NOR boot mode. Now uniphier_v7_defconfig is almost hitting this size limit. Changing CONFIG_SPL_STACK can raise the size limit with less impact. With this, the size limit will increase to 576KB (0x70000 - 0x100000). If we need to increase it even more, we would be able to change CONFIG_SYS_UBOOT_BASE at the cost of the flashing command changes. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | ARM: uniphier: select a correct mmc device before flashing imagesMasahiro Yamada2018-04-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards support an SD card and an eMMC device at the same time. Since both belong to 'mmc', they are identified by a device number. When the device number of the eMMC is 1 instead 0, "mmc dev" command must be performed to switch the target device before flashing images. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | clk: uniphier: disable SPL_CLKMasahiro Yamada2018-04-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The last clock consumer in SPL, SD/eMMC driver, gave up using the clock driver. The clock driver is only used in U-Boot proper. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | ARM: dts: uniphier: drop u-boot, dm-pre-reloc from SD/eMMC clock nodeMasahiro Yamada2018-04-241-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the SD/eMMC driver does not use the clock driver in SPL, remove u-boot,dm-pre-reloc properties to let the fdtgrep tool drop the unnecessary nodes. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | mmc: uniphier-sd: skip clock set-up for SPLMasahiro Yamada2018-04-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The size of SPL is hitting the limit (64KB) for uniphier_v7_defconfig. When booting from SD/eMMC, obviously its clock has been properly set up by the boot ROM. Acutually, no need to re-initialize the clock in SPL. Using a clock driver would generalize the SoC specific code, but solving the memory footprint problem would win. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | mmc: tmio: move clk_enable() to each driver's probe functionMasahiro Yamada2018-04-243-22/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I need to differentiate the clock handling for uniphier-sd. Move it to each driver's probe function from the tmio common code so that renesas-sdhi will not be affected. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | | ARM: uniphier: increase CONFIG_SYS_MONITOR_LENMasahiro Yamada2018-04-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | With the recent changes, the size of the U-Boot proper image for uniphier_v7_defconfig exceeded the current limit, 512KB, then SPL fails to load the whole of the U-Boot proper. Increase the size. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | Merge tag 'xilinx-for-v2018.05-rc3' of git://git.denx.de/u-boot-microblazeTom Rini2018-04-239-25/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xilinx fixes for v2018.05-rc3 - Fix nand initialization - Runtime ddr detection for static DDR setting - Enable rewriting env locations - Sync defconfig for zc770 xm011 - Remove useless ioremap in watchdog - Check return value from soc_clk_dump()
| * | | cmd: clk: Check return value from soc_clk_dumpMichal Simek2018-04-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of error in soc_clk_dump function are returned different values then CMD return values (-1, 0, 1). For example: ZynqMP> clk dump exit not allowed from main input shel The patch is checking all negative return values and return CMD_RET_FAILURE which is proper reaction for these cases. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | watchdog: cadence: Remove useless ioremapMichal Simek2018-04-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to call ioremap. Also reg pointer is completely unused in the driver. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | arm: zynq: Sync zc770 xm011 defconfigsMichal Simek2018-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | x8 and x16 configurations should be in sync. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | arm: zynq: Make ENV_SIZE and ENV_OFFSET optional via board fileMichal Simek2018-04-231-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boards have an option to rewrite variable locations in their own board files. This is necessary for qspi and nand configurations where boot image can be bigger then 896k(current limit). Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | arm: zynq: Wire automatic ddr detection for Zynq and ZynqMP caseMichal Simek2018-04-232-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When static memory configuration is used U-Boot has capability to detect memory size in setup range. Enable this feature for static configuration. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | arm: zynq: Enable setup board name for different boardsMichal Simek2018-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to use zynq name as SYS_BOARD for all boards. The patch is adding an option to change it. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | nand: zynq: Cleanup initializationEzequiel Garcia2018-04-232-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_NAND_ZYNQ selects CONFIG_SYS_NAND_SELF_INIT, so the driver doesn't have to play any ifdef game. Also, we can mark zynq_nand_init() as static and get rid of the mach-specific nand.h header. This is really a revert of: "mtd: zynq: nand: Move board_nand_init() function to board.c" (sha1: 310995d9f91ae56082b49be06fe8c3d01424f8f6) Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Reviewed-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | | nand: zynq: Fix driver initializationEzequiel Garcia2018-04-231-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver is currently broken, refusing to initialize properly. The reason is that get_nand_dev_by_index() was being called before nand_register(), thus returning a pointer into uninitialized memory. In other words, the struct mtd_info used by the driver is total junk. Fix it by getting the correct struct mtd_info, via nand_to_mtd() on the driver's struct nand_chip. Tested on a custom board, where the CPU is halted without this patch. Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Reviewed-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | mmc: avoid division by zero in meson_mmc_config_clockHeinrich Schuchardt2018-04-231-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The Odroid C2 fails to read from mmc with U-Boot v2018.03. The change avoids a division by zero. The fix was suggested by Jaehoon in https://lists.denx.de/pipermail/u-boot/2018-January/318577.html Reported-by: Vagrant Cascadian <vagrant@debian.org> Suggested-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested-by: Vagrant Cascadian <vagrant@debian.org>
* | Merge git://git.denx.de/u-boot-usbTom Rini2018-04-222-2/+4
|\ \
| * | usb: dwc3-of-simple: fix error check of clk_get_bulk when disabledNeil Armstrong2018-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The disabled clk API returns -ENOSYS unlike the reset API returning -ENOTSUPP. Fixes: ca7fdc8b1267 ("usb: host: Add simple of glue driver for DWC3 USB Controllers integration") Reported-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
| * | usb: dwc3-of-simple: Add support for DRA7/AM57 platforms.Jean-Jacques Hiblot2018-04-212-0/+2
| | | | | | | | | | | | | | | | | | | | | Add the compatibility with "ti,dwc3" and enable it by default if DM_USB is enabled. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
| * | usb: dwc3-of-simple: Fix dependenciesJean-Jacques Hiblot2018-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | This simple glue layer does not require CONFIG_MISC, but it does require CONFIG_DM_USB. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | | Merge git://git.denx.de/u-boot-shTom Rini2018-04-2222-213/+729
|\ \ \ | |/ / |/| |
| * | ARM: rmobile: Update E2 SilkMarek Vasut2018-04-217-179/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The E2 Silk port was broken since some time. This patch updates the E2 Silk port to use modern frameworks, DM, DT probing, SPL for the preloading and puts it on par with the M2 Porter board. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> --- NOTE: The port is missing support for I2C1 for DA9063 reset, since the I2C driver needs to be converted to DM and DT probing. That's not an issue for this patch though, since the reset was broken on Silk since forever.
| * | mmc: sh_mmcif: Migrate configs to CONFIG_SH_MMCIFMarek Vasut2018-04-2113-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | Migrate the U-Boot configs to Kconfig CONFIG_SH_MMCIF . Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Jaehoon Chung <jh80.chung@samsung.com>
| * | mmc: sh_mmcif: Add Kconfig entryMarek Vasut2018-04-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add Kconfig entry for SH MMCIF driver. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Jaehoon Chung <jh80.chung@samsung.com>
| * | mmc: sh_mmcif: Add DM and DT probing supportMarek Vasut2018-04-211-13/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MMC DM and DT probing support into the SH MMCIF driver. This patch abstracts out the common bits of the send command and set ios functions, so they can be used both by DM and non DM setups and adds the DM probe support. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Jaehoon Chung <jh80.chung@samsung.com>
| * | clk: renesas: Minor clean up of the R8A7794 clock driverMarek Vasut2018-04-211-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | The initconst is not used in U-Boot, drop it. The r8a7794_crit_mod_clks is also not used in U-Boot, so drop it too. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | clk: renesas: Minor clean up of the R8A7792 clock driverMarek Vasut2018-04-211-7/+3
|/ / | | | | | | | | | | | | | | The initconst is not used in U-Boot, drop it. The r8a7792_crit_mod_clks is also not used in U-Boot, so drop it too. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* | Merge git://git.denx.de/u-boot-uniphierTom Rini2018-04-1827-206/+936
|\ \
| * | reset: uniphier: add ethernet reset control supportKunihiko Hayashi2018-04-181-0/+5
| | | | | | | | | | | | | | | | | | | | | Add reset lines for ethernet controller on each SoC. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | clk: uniphier: add ethernet clock control supportKunihiko Hayashi2018-04-181-0/+6
| | | | | | | | | | | | | | | | | | | | | Add clock control for ethernet controller on each SoC. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: dts: uniphier: sync DT with Linux 4.17-rc1Masahiro Yamada2018-04-1825-206/+925
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
View Lorry Controller Status