summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix compilation error if CONFIG_USB is disabledakaher2019-06-121-5/+31
| | | | | | | | | | | | This patch is to fix the following compilation error when disabling CONFIG_USB for Rpi3: include/config_distro_bootcmd.h:242:2: error: expected ‘}’ before ‘BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB’ BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB Signed-off-by: Ajay Kaher <akaher@vmware.com> Signed-off-by: Matthias Brugger <mbrugger@suse.com>
* Prepare v2019.07-rc4Tom Rini2019-06-101-1/+1
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2019-06-104-104/+194
|\ | | | | | | | | | | - mpc8xxx spi driver fixes (Mario) - mpc8xxx spi dm conversion (Mario, Jagan) - SPI DM Migration update (Jagan)
| * dm: MIGRATION: Update migration status for SPIJagan Teki2019-06-101-5/+1
| | | | | | | | | | | | | | | | | | Now, we have few driver are fully converted into dm and few are partially converted. So, update the migration status accordingly. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Convert to DMJagan Teki2019-06-102-42/+112
| | | | | | | | | | | | | | | | Support DM in the MPC8xxx SPI driver, and remove the legacy SPI interface. Signed-off-by: Mario Six <mario.six@gdsys.cc> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Use get_timerMario Six2019-06-101-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment before the transmission loop in conjunction with the definition of SPI_TIMEOUT as 1000 implies that the loop is supposed to have a timeout value of 1000 ms. But since there is no mdelay(1) or similar in the loop body, the loop just runs 1000 times, without regard for the time elapsed. To correct this, use the standard get_timer functionality to properly time out the loop after 1000 ms. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Fix if checkMario Six2019-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decreasing the bit length and increasing the write data pointer should be done when there are more than 32 bit of data, not 16 bit. This did not produce incorrect behavior, because the only time where the two checks produce different outcomes is the case of 16 < bitlen < 32, and in this case the subsequent transmission is the last one regardless, hence the additional bit length decrease and write data pointer increase has no effect anyway. Still, the correct check is the check for "bitlen > 32", so correct this behavior. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Re-order transfer setupMario Six2019-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | Minize the time the adapter is disabled (via SPI_MODE_EN clearing/setting) to just the character length setting, and only set up the temporary data writing variable right before we need it, so there is a more clear distinction between setting up the SPI adapter, and setting up the data to be written. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Document LEN setting betterMario Six2019-06-101-11/+5
| | | | | | | | | | | | | | | | | | | | Instead of having a table right before the code implementing the length setting for documentation, have inline comments for the if branches actually implementing the length setting described table's entries (which is readable thanks to the set_char_len function). Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Rename variableMario Six2019-06-101-4/+4
| | | | | | | | | | | | | | | | | | The variable "char_size" holds the number of bits to be transferred in the current loop iteration. A better name would be "xfer_bitlen", which we rename this variable to. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Make code more readableMario Six2019-06-101-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | Introduce the to_prescale_mod and set_char_len inline functions to make the code more readable. Note that the added "if (bitlen > 16)" check does not change the semantics of the current code, and hence only preserves the current error (this will be fixed in a later patch in the series). Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Reduce scope of loop variablesMario Six2019-06-101-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The transmission loop starts with setting some variables, which are only used inside the loop. Reduce the scope to the loop to make the declaration and initialization of these variables coincide. In the case of char_size this also always initializes the variable immediately with the final value actually used in the loop (instead of the placeholder value 32). Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Simplify logic a bitMario Six2019-06-101-10/+13
| | | | | | | | | | | | | | | | | | We do nothing in the loop if the "not empty" event was not detected. To simplify the logic, check if this is the case, and skip the execution of the loop early to reduce the nesting level and flag checking. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Get rid of is_readMario Six2019-06-101-5/+7
| | | | | | | | | | | | | | | | | | Get rid of the is_read variable, and just keep the state of the "not empty" and "not full" events in two boolean variables within the loop body. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Simplify ifMario Six2019-06-101-7/+5
| | | | | | | | | | | | | | | | Instead of having a nested if block, just have two branches within the overarching if block to eliminate one nesting level. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Use IO accessorsMario Six2019-06-101-19/+19
| | | | | | | | | | | | | | | | | | | | Accesses to the register map are currently done by directly reading and writing the structure. Switch to the appropriate IO accessors instead. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Replace defines with enumsMario Six2019-06-101-7/+19
| | | | | | | | | | | | | | | | Replace pre-processor defines with proper enums, and use the BIT macro where applicable. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Fix function names in stringsMario Six2019-06-101-4/+5
| | | | | | | | | | | | | | | | Replace the function name with a "%s" format string and the __func__ variable in debug statements (as proposed by checkpatch). Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Fix space after castMario Six2019-06-101-3/+3
| | | | | | | | | | | | | | Fix all "superfluous space after case" style errors. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Rename camel-case variablesMario Six2019-06-101-11/+11
| | | | | | | | | | | | | | | | | | | | There are three variables that have camel-case names, which is not the preferred naming style. Give those variables more compliant names instead. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Fix commentsMario Six2019-06-101-8/+14
| | | | | | | | | | | | | | | | | | There are some comments on the same line as the code they document. Put comments above the code lines they document, so the line length is not unnecessarily increased. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * spi: mpc8xxx: Use short type namesMario Six2019-06-101-7/+5
| | | | | | | | | | | | | | | | The function signatures in the driver are quite long as is. Use short type names (uint etc.) to make them more readable. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
| * ids8313: Disable SPIMario Six2019-06-101-3/+0
| | | | | | | | | | | | | | | | | | | | | | With the recent SPI changes, the ids8313 board won't compile anymore. Until further information from the manufacturer, disable SPI support, so that the board will at least compile again. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Heiko Schocher <hs@denx.de> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
* | Merge tag 'video-updates-for-2019.07-rc3' of git://git.denx.de/u-boot-videoTom Rini2019-06-1014-62/+250
|\ \ | | | | | | | | | | | | | | | - mxsfb DM_VIDEO conversion - splash fix for DM_VIDEO configurations - meson HDMI fix for boards without hdmi-supply regulator
| * | video: meson: hdmi-supply regulator should be optionalMaxime Jourdan2019-06-051-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards don't have such a regulator, and don't need one to enable HDMI display. Make it optional, fixing hdmi display for those boards. Also surround the regulator code with a config check on DM_REGULATOR. Reported-by: Mohammad Rasim <mohammad.rasim96@gmail.com> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> Tested-by: Mohammad Rasim <mohammad.rasim96@gmail.com>
| * | colibri_imx7_emmc: enable DM_VIDEOIgor Opaniuk2019-06-041-1/+1
| | | | | | | | | | | | | | | | | | Enable DM_VIDEO for Colibri iMX7 eMMC version. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | ARM: dts: colibri_imx7: Add lcdif nodeIgor Opaniuk2019-06-042-0/+30
| | | | | | | | | | | | | | | | | | Extend lcdif DT node with proper display-timings for mxsfb driver. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | video: mxsfb: add DM_VIDEO supportIgor Opaniuk2019-06-044-12/+139
| | | | | | | | | | | | | | | | | | | | | | | | Extend the driver to build with DM_VIDEO enabled. DTS files must additionally include 'u-boot,dm-pre-reloc' property in soc and child nodes to enable driver binding to mxsfb device. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | video: mxsfb: refactor video_hw_init()Igor Opaniuk2019-06-041-27/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor video_hw_init() function, and introduce an independent function for the common procedure of initialization. Currently video_hw_init() is only in charge of parsing configuration from env("videomode") and filling struct GraphicPanel, and new mxs_probe_common() does hw specific initialization (invocation of mxs_lcd_init() etc.) Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | video: mxsfb: reorder includesIgor Opaniuk2019-06-041-4/+3
| | | | | | | | | | | | | | | | | | | | | Follow alphabetical order of includes, which simplifies detecting duplicate includes etc. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | video: mxsfb: change mxs_lcd_init signatureIgor Opaniuk2019-06-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Provide directly framebuffer address instead of pointer to GraphicDevice struct, which will let to re-use this function in DM_VIDEO configurations. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | colibri imx6/t20: enable CONFIG_SYS_WHITE_ON_BLACKIgor Opaniuk2019-06-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Enable CONFIG_SYS_WHITE_ON_BLACK by default for DM_VIDEO enabled configurations, where env("splashimage") is used for showing Toradex boot logo. Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
| * | splash: display splash in DM_VIDEO configurationsIgor Opaniuk2019-06-044-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently for CONFIG_DM_VIDEO=y setting splashimage env variable doesn't have any effect. Introduce a common function for both dm-video/lcd stacks, that checks env("splashimage") and invokes bmp_display() accordingly. For additional details please check discussion [1]. [1] https://lists.denx.de/pipermail/u-boot/2019-May/371002.html Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
* | | Merge tag 'u-boot-atmel-fixes-2019.07-a' of git://git.denx.de/u-boot-atmelTom Rini2019-06-108-1/+65
|\ \ \ | | | | | | | | | | | | First set of u-boot-atmel fixes for 2019.07 cycle
| * | | configs: at91: sama5d2_icp: enable CONFIG_SPL_AT91_MCK_BYPASS and resyncEugen Hristev2019-06-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Enabled CONFIG_SPL_AT91_MCK_BYPASS and resync with savedefconfig Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | spl: at91: add support for SPL_AT91_MCK_BYPASSEugen Hristev2019-06-062-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default the configuration of the PMC is to have an external crystal connected that requires driving on both XIN and XOUT pins. The bypass configuration means that only XIN will be used, the SoC will not do any driving, and the XIN needs to be provided with a proper signal. This is the MOSCXTBY bit in the PMC main clock generator register. The SPL needs to properly initialize the PMC registers before switching to external clock signal and raising the clock to the cruise speed. Also created Kconfig for this specific configuration. By default this is disabled. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | configs: atmel: sama5d4_xplained_mmc: enable HW PMECCEugen Hristev2019-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NAND: BUG at drivers/mtd/nand/raw/nand_base.c:4361/nand_scan_tail()! This board has a NAND flash enabled, and it requires the HW PMECC in order to correctly probe this flash. In the NAND flash configuration , this is selected by the GENERATE_PMECC_HEADER which is not needed for mmc configuration. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | configs: sama5d2_ptc_ek: fix NAND PMECC_CAPTudor Ambarus2019-05-232-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFIG_PMECC_CAP has a higher priority than its ONFI detected parameter and will overwrite it when defined. As per commit 49ad40298cc5, CONFIG_PMECC_CAP has a default value of 2 if not otherwise stated. This results in the overwriting of the ONFI ECC bits value. The following errors are seen when booting the kernel from the nand flash: Loading Environment from NAND... PMECC: Too many errors NAND read from offset 140000 failed -74 *** Warning - some problems detected reading environment; recovered successfully *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: eth0: ethernet@f8008000 Hit any key to stop autoboot: 0 NAND read: device 0 offset 0x180000, size 0x80000 PMECC: Too many errors NAND read from offset 180000 failed -74 0 bytes read: ERROR NAND read: device 0 offset 0x200000, size 0x600000 PMECC: Too many errors NAND read from offset 200000 failed -74 0 bytes read: ERROR Bad Linux ARM zImage magic! Fix it by setting the right value for ECC bits. Fixes: 49ad40298cc5 ("ARM: at91: Convert SPL_GENERATE_ATMEL_PMECC_HEADER to Kconfig") Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
| * | | board: atmel: sama5d2_icp: enable green led on SPL completionEugen Hristev2019-05-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the green led on SPL completion. Red led has no pulldown and it will be lighted by default when the board starts up. If the PMIC is not configured to enable LDO2, the leds will not light. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | board: atmel: sama5d2_icp: standby disable on CAN transceivers in SPLEugen Hristev2019-05-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 2 CAN transceivers have a STBDY pin which must be low in order to operate. This pin is tied to PB25. Set it to 0 in bootstrap. At a later time, this needs to be controlled by Linux power management system, or requested by some driver as a gpio and tied to 0 during CAN link up. Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | board: atmel: sama5d2_icp: add periph reset in SPL hw initEugen Hristev2019-05-151-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some periphs on the board need to be reset by holding their reset GPIO down for a specific time period. On a warm reset, the periphs are not being reset by any reset pin and may be in a wrong state. Reset them in the SPL to make sure we are booting into the correct state machine of the specific board periphs (KSZ eth switch, USB hub, HSIC eth, Ethercat) Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
| * | | arm: at91: gardena-smart-gateway-at91sam: Enable CMD_WDTStefan Roese2019-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the "wdt" command, which is quite useful for watchdog testing. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Eugen Hristev <eugen.hristev@microchip.com>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-tegraTom Rini2019-06-0857-723/+1242
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bulk of these changes are an effort to unify Tegra186 builds with builds of prior 64-bit Tegra generations. On top of that there are various improvements that allow data (such as the MAC address and boot arguments) to be passed through from early firmware to the kernel on boot.
| * | | | ARM: tegra: Mark built-in Ethernet as default on Jetson TX2Thierry Reding2019-06-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an "ethernet" alias that points to the default network interface, which is the built-in EQoS on Jetson TX2. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | ARM: tegra: Rename pcie-controller to pcieThierry Reding2019-06-0516-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent versions of DTC have checks for PCI host bridge device tree nodes that are named something other than "pci" or "pcie". Fix all occurrences of such nodes for Tegra boards to avoid potential warnings from DTC. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | p2771-0000: Add support for framebuffer carveoutsThierry Reding2019-06-051-4/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If early firmware initialized the display hardware and the display controllers are scanning out a framebuffer (e.g. a splash screen), make sure to pass information about the memory location of that framebuffer to the kernel before booting to avoid the kernel from using that memory for the buddy allocator. This same mechanism can also be used in the kernel to set up early SMMU mappings and avoid SMMU faults caused by the display controller reading from memory for which it has no mapping. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | p2371-2180: Add support for framebuffer carveoutsThierry Reding2019-06-051-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If early firmware initialized the display hardware and the display controllers are scanning out a framebuffer (e.g. a splash screen), make sure to pass information about the memory location of that framebuffer to the kernel before booting to avoid the kernel from using that memory for the buddy allocator. This same mechanism can also be used in the kernel to set up early SMMU mappings and avoid SMMU faults caused by the display controller reading from memory for which it has no mapping. Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | p2771-0000: Pass Ethernet MAC to the kernelThierry Reding2019-06-053-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the ethernet MAC address to the kernel upon boot. This passes both the local-mac-address property (as passed to U-Boot from cboot) and the currently set MAC address via the mac-address property. The latter will only be set if it is different from the address that was already passed via the local-mac-address property. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | p2371-2180: Pass Ethernet MAC to the kernelThierry Reding2019-06-052-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the ethernet MAC address to the kernel upon boot. This passes both the local-mac-address property (as passed to U-Boot from cboot) and the currently set MAC address via the mac-address property. The latter will only be set if it is different from the address that was already passed via the local-mac-address property. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
| * | | | ARM: tegra: Enable position independent build for 64-bitThierry Reding2019-06-055-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that U-Boot is always chainloaded from cboot starting with L4T release 28. cboot always loads U-Boot to a fixed address, so making the builds position independent isn't strictly necessary. However, position independent builds can be convenient because if U-Boot is ever loaded to an address different from its link address, it will still be able to boot. Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>