summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2018-11-135-16/+63
|\
| * mtd: Drop duplicate MTD_PARTITIONS Kconfig optionBoris Brezillon2018-11-131-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 9c5b00973bce ("Convert CONFIG_MTD_PARTITIONS et al to Kconfig") introduced a publicly visible Kconfig entry for the CONFIG_MTD_PARTITIONS option, while the rework on MTD partitioning was in progress, and we somehow did not notice that the same Kconfig entry was added by commit 4048a5c519a8 ("mtd: declare MTD_PARTITIONS symbol in Kconfig"), but this time as an invisible entry (this can only be selected by other options). Keep the non-visible version of this symbol, since MTD_PARTITIONS is not something the user should be able to enable/disable directly. Fixes: 4048a5c519a8 ("mtd: declare MTD_PARTITIONS symbol in Kconfig") Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * cmd: ubi: Remove useless call to mtdparts_init()Boris Brezillon2018-11-132-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c58fb2cdb3e4 ("cmd: ubi: clean the partition handling") introduced a call to mtd_probe_devices() in the ubi_attach() path and this function takes care of parsing mtdparts/mtdids and creating/registering the associated mtd partitions. The mtdparts_init() call in the ubi_detach() path is not only unnecessary but can sometimes print error messages even when things work properly (that's the case with SPI NAND devices that have not been probed with 'mtd list'), which is misleading. Remove this call to mtdparts_init() and drop the dependency on CMD_MTDPARTS. Fixes: c58fb2cdb3e4 ("cmd: ubi: clean the partition handling") Reported-by: Stefan Roese <sr@denx.de> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * mtd: Make {MTDIDS, MTDPARTS}_DEFAULT visible when MTD_PARTITIONS is selectedBoris Brezillon2018-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gwventana configs are relying on CMD_UBI to select CMD_MTDPARTS, which is then making {MTDIDS,MTDPARTS}_DEFAULT options available. We are about to remove the 'select CMD_MTDPARTS' statement in the CMD_UBI entry, but if we do that without first making sure {MTDIDS,MTDPARTS}_DEFAULT are visible, we end up with a build failure when building gwventana configs. Address that by adding a depends on MTD_PARTITIONS to {MTDIDS,MTDPARTS}_DEFAULT which does the trick since CMD_UBI selects MTD_UBI which in turn selects MTD_PARTITIONS. We also get rid of the depends on CMD_MTD, since CMD_MTD also selects MTD_PARTITIONS. Reported-by: Jagan Teki <jagan@amarulasolutions.com> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * dfu: nand: Add missing dependency on CMD_MTDPARTSBoris Brezillon2018-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | dfu_fill_entity_nand() uses find_dev_and_part() and mtdparts_init() which are provided by cmd/mtdparts.c. Add the dependency to avoid build failures when CMD_MTDPARTS is not selected. Reported-by: Jagan Teki <jagan@amarulasolutions.com> Fixes: 6828e602b722d ("dfu: Migrate to Kconfig") Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
| * mtd: Use default mtdparts/mtids when not defined in the environmentBoris Brezillon2018-11-131-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-boot provides a mean to define default values for mtdids and mtdparts when they're not defined in the environment. Patch mtd_probe_devices() to use those default values when env_get("mtdparts") or env_get("mtdids") return NULL. This implementation is based on the logic found in cmd/mtdparts.c. Fixes: 5db66b3aee6f ("cmd: mtd: add 'mtd' command") Reported-by: Stefan Roese <sr@denx.de> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> Tested-by: Stefan Roese <sr@denx.de> Reviewed-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Jagan Teki <jagan@openedev.com>
* | configs: Resync with savedefconfigTom Rini2018-11-13139-235/+117
|/ | | | | | Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge tag 'u-boot-imx-20181112' of git://git.denx.de/u-boot-imxTom Rini2018-11-123-4/+26
|\ | | | | | | Fix build vf boards + fix gpr_init()
| * imx: mkimage: add size check to the u-boot.imx make targetMarcel Ziswiler2018-11-121-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | The make macro to check if the binary exceeds the board size limit is taken straight from the root Makefile. Without this and e.g. enabled EFI Vybrid fails booting as the regular size limit check does not take the final u-boot.imx binary size into account which is bigger due to alignment as well as IMX header stuff. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
| * board: toradex: colibri_vf: drop SPI supportMarcel Ziswiler2018-11-121-4/+0
| | | | | | | | | | | | | | | | Drop SPI support saving precious 4 Kb on boards with tough size restrictions. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Signed-off-by: Marcel Ziswiler <marcel@ziswiler.com>
| * board: toradex: colibri_vf: unset CONFIG_CMDLINE_EDITINGMarcel Ziswiler2018-11-121-0/+1
| | | | | | | | | | | | | | Unset CONFIG_CMDLINE_EDITING saving precious 4 Kb on boards with tough size restrictions. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| * board: toradex: colibri_vf: efi_loader: unset CONFIG_EFI_UNICODE_CAPITALIZATIONMarcel Ziswiler2018-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | Unset CONFIG_EFI_UNICODE_CAPITALIZATION on boards with tough size restrictions. This is analogous to commit a90bf07afc43 ("efi_loader: unset CONFIG_EFI_UNICODE_CAPITALIZATION"). Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Reviewed-by: Alexander Graf <agraf@suse.de>
| * imx: imx6: perform gpr_init only on suitable cpu typesChristoph Niedermaier2018-11-081-0/+8
| | | | | | | | | | | | | | | | | | If the function gpr_init is used in a common MX6 spl implementation we have to ensure that it is only called for suitable cpu types, otherwise it breaks hardware parts like enet1, can1, can2, etc. Signed-off-by: Christoph Niedermaier <cniedermaier@dh-electronics.de>
* | mmc: dw_mmc: Add RCRC handlingMarek Vasut2018-11-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds check for command response CRC failure. The driver is currently ignoring CRC check failure on command resposes which have CRC atteched to it, which can be potentially dangerous. Even more grueling problem happens when the command response is followed by data transfer though, as in that case, the dwmci_data_transfer() function will spin until it reaches the 240s timeout. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | common: build ymodem only on needJun Nie2018-11-091-1/+2
| | | | | | | | | | | | Build ymodem only on need to shrink spl image size. Signed-off-by: Jun Nie <jun.nie@linaro.org>
* | common: Compile error with CONFIG_MULTI_DTB_FIT and not SPLLars Povlsen2018-11-091-1/+0
| | | | | | | | | | | | | | | | | | common/common_fit.c is including <spl.h>, but not actually using it. The inclusion will cuase compile error on platforms using CONFIG_OF_SEPARATE and not SPL. Signed-off-by: Lars Povlsen <lars.povlsen@microsemi.com> Reviewed-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
* | dm: Fix typo - missed semicolonAndy Shevchenko2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The commit 484fdf5ba058 ("dm: Add support for all targets which requires MANUAL_RELOC") introduces subtle typo, i.e. missed semicolon. Fixes: 484fdf5ba058 ("dm: Add support for all targets which requires MANUAL_RELOC") Cc: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Michal Simek <michal.simek@xilinx.com>
* | spl: fix debug prints for tiny printfSimon Goldschmidt2018-11-091-8/+6
| | | | | | | | | | | | | | | | | | Tiny printf does not support %.*s and %lX. Since tiny printf should be very common in SPL, replace these by %32s (for printing image name) and %lx. Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | MAINTAINERS: Update stm32mp entryPatrick Delaunay2018-11-092-0/+2
| | | | | | | | | | | | Add mailing list for stm32mp architecture and board. Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
* | fit: Add missing CR in debug output in fit_find_config_node()Stefan Roese2018-11-091-1/+1
| | | | | | | | | | | | | | Testing has shown that a line-break is missing in one debug line in fit_find_config_node(). Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge branch 'master' of git://git.denx.de/u-boot-ubiTom Rini2018-11-081-1/+3
|\ \ | |/ |/|
| * fs: ubifs: Fix UBIFS decompression on 64 bitPaul Davey2018-11-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add local size_t variable to crypto_comp_decompress as intermediate storage for destination length to avoid memory corruption and incorrect results on 64 bit targets. This is what linux does for the various lz compression implementations. Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz> Cc: Heiko Schocher <hs@denx.de> Tested-by: Heiko Schocher <hs@denx.de>
* | imx8qxp_mek: Disable CONFIG_DISPLAY_CPUINFOBin Meng2018-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | Due to revert of commit c0434407b595, this board does not build any more. Disable CONFIG_DISPLAY_CPUINFO for v2018.11 release. This commit should be reverted after v2018.11 release. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Revert "board_f: Use static print_cpuinfo if CONFIG_CPU is active"Bin Meng2018-11-072-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c0434407b595f785fc7401237896c48c791b45fd. It turns out commit c0434407b595 broke some boards which have DM CPU driver with CONFIG_DISPLAY_CPUINFO option on. These boards just fail to boot when print_cpuinfo() is called during boot. Fixes are already sent to ML and in u-boot-dm/next, however since we are getting close to the v2018.11 release, it's safer we revert the original commit. This commit should be reverted after v2018.11 release. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Merge tag 'xilinx-for-v2018.11-rc3' of git://git.denx.de/u-boot-microblazeTom Rini2018-11-071-0/+2
|\ \ | |/ |/| | | | | | | Xilinx fixes for v2018.11-rc3 - Fix fit loading address for Zynq
| * arm: zynq: Setup non zero SPL FIT load addressMichal Simek2018-11-071-0/+2
|/ | | | | | | | Default setup is 0 which is incorrect place because it points to OCM which is allocated for SPL only in our case. Use address in DDR. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* Merge tag 'u-boot-imx-20181106' of git://git.denx.de/u-boot-imxTom Rini2018-11-064-107/+54
|\ | | | | | | Fix coverity issues for i.MX8
| * MAINTAINERS: add NXP linux team maillist as i.MX reviewerPeng Fan2018-11-061-0/+1
| | | | | | | | | | | | Add NXP linux team upstream maillist as reviewer Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * ARM: dts: fsl-imx8qxp-mek: Move regulator outside "simple-bus"Fabio Estevam2018-11-061-12/+8
| | | | | | | | | | | | | | | | | | | | Commit 3c28576bb0f0 ("arm: dts: imx8qxp: fix build warining") fixed the dts warning by removing the unnecessary #address-cells/#size-cells, but the recommendation for regulators is not to place them under "simple-bus", so move the reg_usdhc2_vmmc regulator accordingly. Signed-off-by: Fabio Estevam <festevam@gmail.com>
| * mx8mq_evk: README: Delete file introduced by mistakeFabio Estevam2018-11-061-81/+0
| | | | | | | | | | | | | | | | | | | | | | | | board/freescale/mx8mq_evk/README has been introduced by mistake in commit d0dd73974c61 ("imx: add i.MX8QXP MEK board support") Remove it for now as this should be introduced when mx8mq_evk support is in place. Reported-by: Tim Harvey <tharvey@gateworks.com> Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
| * tools: imx8image: flatten container header only when creating containerPeng Fan2018-11-061-10/+12
| | | | | | | | | | | | | | If there is no CONTAINER entry, there is no need to flatten container header. Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * tools: imx8image: fix coverity CID 184233Peng Fan2018-11-061-0/+8
| | | | | | | | | | | | | | | | | | Fix: CID 184233: (NEGATIVE_RETURNS) Using variable "container" as an index to array "imx_header.fhdr". Reported-by: Coverity Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * tools: imx8image: fix coverity CID 184234Peng Fan2018-11-061-1/+3
| | | | | | | | | | | | | | | | | | Fix: CID 184234: (TAINTED_SCALAR) Using tainted variable "header.num_images - 1" as an index into an array "header.img". Reported-by: Coverity Signed-off-by: Peng Fan <peng.fan@nxp.com>
| * tools: imx8image: check lseek return valuePeng Fan2018-11-061-4/+23
| | | | | | | | | | | | | | | | | | | | Check lseek return value. Fix Coverity CID: 184236 184235 184232 Reported-by: Coverity Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
* | Merge git://git.denx.de/u-boot-marvellTom Rini2018-11-063-8/+12
|\ \
| * | arm: mvebu: armada-xp-theadorable.dts: Change CS# for 2nd FPGAStefan Roese2018-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new board version has the 2nd FPGA connected via CS# 0 instead of 2 on SPI bus 1. Change this setup in the DT accordingly. Please note that this change does still work on the old board version because the CS signal is not used on this board. Signed-off-by: Stefan Roese <sr@denx.de>
| * | arm: mvebu: armada-xp-theadorable.dts: Add "spi-flash" compatible propertyStefan Roese2018-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Add the "spi-flash" compatible string so that the generic sf_probe driver can probe the SPI flash on the theadorable Armada-XP board. Signed-off-by: Stefan Roese <sr@denx.de>
| * | arm: mvebu: Move PCI(e) MBUS window to end of RAMStefan Roese2018-11-062-5/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With patch 49b23e035d96 (pci: mvebu: Increase size of PCIe default mapping) the mapping size for each PCI(e) controller was increased from 32MiB to 128MiB. This leads to problems on boards with multiple PCIe slots / ports which are unable to map all PCIe ports, e.g. the Armada-XP theadorable: DRAM: 2 GiB (667 MHz, 64-bit, ECC not enabled) SF: Detected m25p128 with page size 256 Bytes, erase size 256 KiB, total 16 MiB Cannot add window '4:f8', conflicts with another window PCIe unable to add mbus window for mem at f0000000+08000000 Model: Marvell Armada XP theadorable This patch moves the base address for the PCI(e) memory spaces from 0xe8000000 to the end of SDRAM (clipped to a max of 0xc0000000 right now). This gives move room and flexibility for PCI(e) mappings. Signed-off-by: Stefan Roese <sr@denx.de> Cc: VlaoMao <vlaomao@gmail.com> Tested-by: VlaoMao <vlaomao at gmail.com>
* | Merge git://git.denx.de/u-boot-x86Tom Rini2018-11-063-3/+0
|\ \ | |/ |/|
| * x86: acpi: Remove redundant Offset (0x00)Andy Shevchenko2018-11-063-3/+0
|/ | | | | | | | | | | | | | New ACPI assembler issues a warning: board/intel/edison/dsdt.asl.tmp 13: Offset (0x00), Remark 2158 - ^ Unnecessary/redundant use of Offset operator Indeed, in the OperationRegion the offset is 0x00 by default. Thus, drop unneeded Offset() use as suggested by ACPI assembler. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* Merge branch 'master' of git://git.denx.de/u-boot-shTom Rini2018-11-046-56/+196
|\
| * mmc: tmio: sdhi: Merge DTCNTL access into single register writeMarek Vasut2018-11-021-6/+3
| | | | | | | | | | | | | | | | It is perfectly fine to write th DTCNTL TAP count and enable the SCC sampling clock operation in the same write. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: sdhi: Implement waiting for DAT0 line stateMarek Vasut2018-11-021-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | When the bus switches to 1.8V mode of operation, it is necessary to verify that the card correctly initiated and completed the voltage switch. This is done by reading out the state of DATA0 line. This patch implement support for reading out the state of the DATA0 line, so the MMC core code can correctly switch to 1.8V mode. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: sdhi: Clear HS400 settings when resetting SCCMarek Vasut2018-11-021-0/+7
| | | | | | | | | | | | | | Make sure to clear HS400 configuration when resetting the SCC block. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: sdhi: Touch SCC only when UHS capableMarek Vasut2018-11-021-2/+3
| | | | | | | | | | | | | | | | Add check to avoid touching the SCC tuning registers in case the IP doesn't support them or if the support isn't in place yet. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: Preinitialize regulator to 3.3VMarek Vasut2018-11-021-0/+2
| | | | | | | | | | | | | | | | | | Preinitialize the SD card signals regulator to 3.3V, which is the default post-reset setting, to be sure the regulator is set to a valid value. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: Configure clock before any other IOSMarek Vasut2018-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | Configure the clock settings before reconfiguring any other IO settings. This is required when the clock must be stopped before changing eg. the pin configuration or any of the other properties of the bus. Running the clock configuration first allows the MMC core to do just that. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: Silence transfer errors when tuningMarek Vasut2018-11-021-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the controller performs card tuning, that is, sends MMC command 19 or 21, silence possible CRC error warning prints. The warnings are bound to happen, since the tuning will fail for some settings while searching for the optimal configuration of the bus and that is perfectly OK. This patch passes around the MMC command structure and adds check into tmio_sd_check_error() to avoid printing CRC error warning when the tuning happens. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: Improve error handlingMarek Vasut2018-11-021-3/+4
| | | | | | | | | | | | | | | | | | Properly handle return values and abort operations when they are non-zero. This is a minor improvement, which fixes two remaining unchecked return values. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: tmio: Simplify pinmux handlingMarek Vasut2018-11-021-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SD UHS SDR12, SDR25, SDR50, SDR104, DDR50 and MMC HS200, HS400 modes all use 1.8V signaling, while all the legacy modes use 3.3V signaling. While there are extra modes which use 1.2V signaling, the existing hardware does not support those. Simplify the pinmux such that 3.3V signaling implies legacy mode pinmux and the rest implies UHS mode pinmux. This prevents the massive case statement from growing further. Moreover, it fixes an edge case where during SD 1.8V switch, the bus mode is still set to default while the signaling is already set to 1.8V, which results in an attempt to communicate with a 1.8V card using pins in 3.3V mode and thus communication failure. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
View Lorry Controller Status