summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'ti-v2020.04-rc4' of ↵WIP/27Feb2020Tom Rini2020-02-276-10/+4
|\ | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-ti - Minor fix in AVS class 0 driver - DHCP fixes in Keystone2 HS platforms.
| * defconfig: k2x_hs: Remove DTB_RESELECT to fix DHCP issueMadan Srinivas2020-02-265-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the inadvertent definition of CONFIG_DTB_RESELECT and CONFIG_MULTI_DTB_FIT in the K2x HS defconfigs, that happened as part of a resync of the defconfigs. The inclusion of these config options causes ethernet to stop working on K2x HS devices as they interfere with the installation of the secure boot monitor. This patch also removes the above configs for the K2 GP devices, as they are not needed, and to keep the differences between the GP and HS defconfigs to a minimum. Signed-off-by: Madan Srinivas <madans@ti.com> Signed-off-by: Andrew F. Davis <afd@ti.com>
| * misc: k3_avs: Fix possible NULL pointer deferenceVignesh Raghavendra2020-02-261-0/+4
| | | | | | | | | | | | | | | | Its possible that k3_avs_priv is NULL because the driver may not have been probed yet. Therefore check if pointer is valid before dereferencing it. Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
* | Merge tag 'efi-2020-04-rc4' of ↵WIP/26Feb2020Tom Rini2020-02-264-12/+48
|\ \ | |/ |/| | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-efi Pull request for UEFI sub-system for efi-2020-04-rc4 UEFI spec 2.8 errata A replaces the RuntimeServicesSupported variable defined in UEFI spec 2.8 by the configuration table EFI_RT_PROPERTIES_TABLE. So let's follow suit.
| * efi_loader: implement EFI_RT_PROPERTIES_TABLEHeinrich Schuchardt2020-02-264-12/+48
|/ | | | | | | | | | UEFI spec 2.8 errata A replaces the RuntimeServicesSupported variable defined in UEFI spec 2.8 by the configuration table EFI_RT_PROPERTIES_TABLE. So let's follow suit. Cc: Ard Biesheuvel <ardb@kernel.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested-by: Ard Biesheuvel <ardb@kernel.org>
* Prepare v2020.04-rc3v2020.04-rc3Tom Rini2020-02-261-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xxWIP/25Feb2020Tom Rini2020-02-2511-1077/+8
|\ | | | | | | | | - Update Sata node for T2080QDS and revert SATA related unrequired patches.
| * arch: powerpc: Rewrite the sata node to fit the driverPeng Ma2020-02-251-11/+4
| | | | | | | | | | | | | | | | | | The sata of our powerpc platforms are updated. These changes is to fit the driver probe. Signed-off-by: Peng Ma <peng.ma@nxp.com> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
| * Revert "configs: enable sata device module in T2080QDS"Peng Ma2020-02-256-23/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 02dc1599ba0b16eb21ba0c206e5b6f38fe7b67a7 Commit 02dc1599ba0b ("configs: enable sata, eSDHC, USB device module in T2080QDS") has some sata defconfig changes to fit support DM mode, Now the driver will be reverted, So revert it. Signed-off-by: Peng Ma <peng.ma@nxp.com> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
| * Revert "powerpc: mpc85xx: delete FSL_SATA for T2080QDS board."Peng Ma2020-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 856b9cdb53f0e6c8d98f81cf71ef363c16b0aa0e. Commit 856b9cdb53f0 ("powerpc: mpc85xx: delete FSL_SATA for T2080QDS board.") is to fit support sata DM mode, Now the driver will be reverted, So revert it. Signed-off-by: Peng Ma <peng.ma@nxp.com> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
| * Revert "ata: fsl_ahci: Add sata DM support for Freescale powerpc socs"Peng Ma2020-02-253-1042/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ee494291880fd51ef0c5f7342e072bdb069d7ff. Commit 1ee494291880 ("ata: fsl_ahci: Add sata DM support for Freescale powerpc socs") introduced SCSI layer to call AHCI private API in order to support sata operations, In DM mode, This is not necessary for non-AHCI sata. So revert it and have already updated the driver itself to operate sata directly. Signed-off-by: Peng Ma <peng.ma@nxp.com> Reviewed-by: Stefan Roese <sr@denx.de> Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
* | Merge branch '2020-02-25-master-imports'Tom Rini2020-02-255-4/+7
|\ \ | | | | | | | | | - Assorted fixes
| * | board: novtech: meerkat96: use correct mmc driverCarl Gelfand2020-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the board was originally submitted, it was attempting to use the ESDHC driver. The board uses the USDHC driver. Signed-off-by: Carl Gelfand <carl@novtech.com> Cc: Shawn Guo <shawn.guo@kernel.org> (maintainer:MEERKAT96 BOARD) Acked-by: Shawn Guo <shawnguo@kernel.org>
| * | moveconfig: convert ps.stderr to stringMarkus Klotzbuecher2020-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing the error message in verbose mode fails, since python3 doesn't implicitely convert bytes to strings. Signed-off-by: Markus Klotzbuecher <mk@mkio.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | moveconfig: replace unsafe eval with astevalMarkus Klotzbuecher2020-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b237d358b425 ("moveconfig: expand simple expressions") added support for expanding expressions in configs, but used the unsafe python built-in "eval". This patch fixes this by replacing eval with the asteval module. Signed-off-by: Markus Klotzbuecher <mk@mkio.de> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * | MAINTAINERS: set maintainer for doc/api/efi.rstHeinrich Schuchardt2020-02-251-0/+1
| | | | | | | | | | | | | | | | | | doc/api/efi.rst belongs to the UEFI sub-system documentation. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * | arch: arm: Fix SZ_64K undeclared compilation errorWasim Khan2020-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Macro SZ_64K is undeclared. Include sizes.h to fix the compilation error. Signed-off-by: Wasim Khan <wasim.khan@nxp.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | tools: image-host.c: remove uboot_aes.hPhilippe Reynes2020-02-251-1/+0
|/ / | | | | | | | | | | | | | | | | The include uboot_aes.h is not useful and it breaks the compilation on android, so we remove it. Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com> Reported-by: Praneeth Bajjuri <praneeth@ti.com>
* | Merge branch '2020-02-24-ci-htmldocs'Tom Rini2020-02-255-14/+65
|\ \ | |/ |/| | | - Update our CI loops to run 'make htmldocs' and stop on errors
| * doc/Makefile: turn warnings into errorsHeinrich Schuchardt2020-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | Several patches delivered incorrect restructured text as documentation. We should be able to discover this in Travis CI, Gitlab CI, or Azure CI. So let us turn all build warnings into errors. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * azure: build HTML documentationHeinrich Schuchardt2020-02-251-0/+10
| | | | | | | | | | | | | | | | | | | | Several patches delivered incorrect restructured text as documentation. We should be able to discover this in Azure CI. Provide a build step for 'make htmldocs'. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * gitlab: build HTML documentationHeinrich Schuchardt2020-02-251-0/+7
| | | | | | | | | | | | | | | | | | | | Several patches delivered incorrect restructured text as documentation. We should be able to discover this in Gitlab CI. Provide a build step for 'make htmldocs'. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * travis: build HTML docsHeinrich Schuchardt2020-02-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Several patches delivered incorrect restructured text as documentation. We should be able to discover this in Travis CI. Provide a build step for 'make htmldocs'. Add required package graphviz. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * travis: Add python3-sphinx to the package listTom Rini2020-02-251-0/+1
| | | | | | | | | | | | | | In order to build htmldocs we need sphinx-build which comes from python3-sphinx. Signed-off-by: Tom Rini <trini@konsulko.com>
| * doc: update doc/sphinx/kerneldoc.pyHeinrich Schuchardt2020-02-241-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | Update doc/sphinx/kerneldoc.py from Linux next-20200219 to avoid warnings like: doc/sphinx/kerneldoc.py:125: RemovedInSphinx20Warning: AutodocReporter is now deprecated. Use sphinx.util.docutils.switch_source_input() instead. self.state.memo.reporter = AutodocReporter(result, self.state.memo.reporter) Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
| * Azure / GitLab: Update Docker imageTom Rini2020-02-242-2/+2
|/ | | | | | | Bring in a newer Docker image to build on that has everything required for running 'make htmldocs'. Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge tag 'u-boot-rockchip-20200220' of ↵WIP/20Feb2020Tom Rini2020-02-2041-159/+494
|\ | | | | | | | | | | | | | | https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip - rk3399: split roc-pc-rk3399 out of evb_rk3399 - sync dts from upstream kernel for rk3399,rk3288,px30 - boot_mode: find the saradc device name
| * arch: arm: rockchip: order the rk3399 entries alphabeticallyPeter Robinson2020-02-201-12/+12
| | | | | | | | | | | | | | | | Put the target entries for rk3399 devices in alphabetical order. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: rk3399: add target type for evb based boardKever Yang2020-02-2011-0/+11
| | | | | | | | | | | | | | | | There are many boards share the board file and device header file with rk3399 evb, add target type MACRO so that it is fixed instead of default to the first target in "RK3399 board select". Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
| * configs: fix typos in khadas-edge defconfigsJared Baldridge2020-02-192-2/+2
| | | | | | | | | | | | s/dtbi/dtb/ Signed-off-by: Jared Baldridge <jrb@expunge.us>
| * board: roc-pc-rk3399: Add support for onboard LED's and push button to ↵Suniel Mahesh2020-02-193-0/+40
| | | | | | | | | | | | | | | | | | | | | | indicate power mode Added support for onboard LED's and push button. When powered board will be in low power mode(yellow LED), on button press, board enters full power mode (red LED) and boots u-boot. Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: rk3399: split roc-pc-rk3399 out of evb_rk3399Suniel Mahesh2020-02-198-6/+101
| | | | | | | | | | | | | | | | | | | | roc-pc-rk3399 board has one user button & three user LED's. Currently we don't have any code support for these devices. Since button and LED's are specific to roc-pc-rk3399 board, split it into its own board file and add code support here. Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: boot_mode: find the saradc device nameHugh Cole-Baker2020-02-191-1/+21
| | | | | | | | | | | | | | | | | | | | adc_channel_single_shot() requires the full device name e.g. "saradc@ff100000", which differs between Rockchip SoC's, but they all share the prefix "saradc"; find the ADC device with this name prefix and use its full name. Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rk3288: vyasa: Add console settingsJagan Teki2020-02-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Add console settings like stdin, stdout and stderr as cros-ec-keyb and vidconsole respectively for Vyasa Rk3288 board. This would certainly help to detect the attached video devices (like HDMI) and print the console message on display. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rk3288: tinker: Enable HDMI outputJagan Teki2020-02-192-1/+11
| | | | | | | | | | | | | | Enable HDMI output for Tinker RK3288 board. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * ARM: dts: rockchip: Sync rk3288-vyasa dts from linuxJagan Teki2020-02-191-47/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync rk3288-vyasa dts file from Linux. This sync has changes required to work HDMI output on Vyasa RK3288 board. This sync excludes the io_domains node since it is not available in rk3288.dtsi. Changes like vcc50_hdmi, vdd10_lcd and ddc-i2c-bus are not merged to Linux yet but wil resync later if any further updates on this. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: rk3288: Enable pre console bufferJagan Teki2020-02-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable pre console buffer for rk3288 platform. This would help to capture the console messages prior to the console being initialised. Enabling this would help to capture all the console messages on video output source like HDMI. So we can find the full console messages of U-Boot proper on HDMI display when enabled it for RK3288 platform boards. Buffer address used for pre console is 0x0f000000 which is ram base plus 240MiB. right now the Allwinner SoC is using similar computation. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: px30: sync the main px30 dtsi from mainlineHeiko Stuebner2020-02-191-11/+171
| | | | | | | | | | | | | | | | | | There have been multiple peripherals added to the main px30 dtsi in the Linux kernel since its addition to u-boot. So to make it easier to sync board devicetrees, update the core dtsi from Linux. Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * arm: dts: rockchip: puma: move U-Boot specific bits to u-boot.dtsiPeter Robinson2020-02-198-25/+36
| | | | | | | | | | | | | | | | Move the U-Boot specific bits to a -u-boot.dtsi include so all the u-boot.dtsi hierarchy is included. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * arm: dts: rockchip: rk3399: Move U-Boot specific bits to rk3399-u-bootPeter Robinson2020-02-192-48/+45
| | | | | | | | | | | | | | | | | | | | There's some bits in the U-Boot rk3399.dtsi that aren't yet in the upstream Linux dtsi but are needed for early boot. This moves them to the u-boot.dtsi to make it easier to sync the rest of rk3399.dtsi with upstream. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * arm: dts: rockchip: Update EVB/Puma devices to upstream USB/dwc3 conventionsPeter Robinson2020-02-192-4/+4
| | | | | | | | | | | | | | | | | | The upstream linux kernel for the Rockchip 3399 SoC use usbdrd3 naming so move the two remaining devices over to that for their device trees to make it easier to sync with upstream DTs. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: make the global board_fit_config_name_match __weakHeiko Stuebner2020-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | The core Rockchip spl code contains a default board_fit_config_name_match implementation doing nothing. Individual boards may want to handle this differently, so add a __weak atribute to make it possible to override this function in other places. Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
| * rockchip: make_fit_atf: use correct fdt_x references in config nodesHeiko Stuebner2020-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The script iterates over the given devicetrees and creates both fdt_x node as well as a conf-node for each passed dt. But there is a slight bug in that it always references fdt_1 in each conf node instead of the matching fdt_x as expected. So fix that by referencing the number of the current dt similar to how the fdt_x nodes gets created. Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
* | Merge tag 'mmc-2-20-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmcTom Rini2020-02-2032-192/+187
|\ \ | | | | | | | | | | | | | | | - sdhci: code clean-up and fix cache coherency problem - enable cache snooping on mpc830x - Fix build error when MMC_WRITE disabled
| * | mmc: sdhci: fix missing cache invalidation after reading by DMAMasahiro Yamada2020-02-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver currently performs cache operation before the DMA start, but does nothing after the DMA completion. When reading data by DMA, the cache invalidation is needed also after finishing the DMA transfer. Otherwise, the CPU might read data from the cache instead of from the main memory when speculative memory read or memory prefetch occurs. Instead of calling the cache operation directly, this commit adds dma_unmap_single(), which performs cache invalidation internally, but drivers do not need which operation is being run. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | mmc: sdhci: use dma_map_single() instead of flush_cache() before DMAMasahiro Yamada2020-02-201-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, sdhci_prepare_dma() calls flush_cache() regardless of the DMA direction. Actually, cache invalidation is enough when reading data from the device. This is correctly handled by dma_map_single(), which mimics the DMA-API in Linux kernel. Drivers can be agnostic which cache operation occurs behind the scene. This commit also sanitizes the difference between the virtual address and the dma address. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | mmc: add mmc_get_dma_dir() helperMasahiro Yamada2020-02-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Copied from Linux kernel. include/linux/mmc/host.h Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| * | mmc: sdhci: remove unneeded castsMasahiro Yamada2020-02-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | host->mmc is already (struct mmc *). memalign() returns an opaque pointer, so there is no need for casting. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| * | mmc: sdhci: use lower_32_bit2() and upper_32_bits() for setting adma_addrMasahiro Yamada2020-02-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use {lower,upper}_32_bits() instead of the combination of cast and shift. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| * | mmc: sdhci: reduce code duplication for aligned bufferMasahiro Yamada2020-02-202-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same code is run for both SDHCI_QUIRK_32BIT_DMA_ADDR and define(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER). Unify the code. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
View Lorry Controller Status