summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: at91: ma5d4: Reset CAN controllers lateMarek Vasut2017-06-291-6/+6
| | | | | | | | | The CAN controllers need slight delay between toggling of their reset line. Move this action into board_init(), otherwise timer will not be initialized and the board might hang. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com>
* ARM: at91: ma5d4: Switch DDR2 controller to sequencial address decodingMarek Vasut2017-06-291-1/+0
| | | | | | | | | | | According to the datasheet, sequential mapping is used for DDR SDRAM, while interleaved mapping is used for regular SDRAM. Incorrect configuration of this bit does indeed cause sporadic memory instability. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Andreas Bießmann <andreas.devel@googlemail.com> Cc: Wenyou Yang <wenyou.yang@atmel.com>
* ARM: atmel: Rename MA5D4EVKMarek Vasut2017-06-296-7/+7
| | | | | | The board is now manufactured by Aries Embedded GmbH , rename it. Signed-off-by: Marek Vasut <marex@denx.de>
* atmel, at91: fix taurus boardHeiko Schocher2017-06-293-9/+5
| | | | | | | | | since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" taurus board comes not up anymore. Fix it. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Wenyou Yang <wenyou.yang@microchip.com>
* at91, dfu, smartweb: set serial numberHeiko Schocher2017-06-291-0/+7
| | | | | | | | | since commit 842778a09104 dfu-util shows serial="UNDEFINED". to see here again a serial number, we have to call g_dnl_set_serialnumber(). Signed-off-by: Heiko Schocher <hs@denx.de>
* atmel, at91: fix smartweb boardHeiko Schocher2017-06-294-9/+8
| | | | | | | | | since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support" smartweb board comes not up anymore. Fix it. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Wenyou Yang <wenyou.yang@microchip.com>
* drivers, usb, gadget: fix compiler warnings for at91_udc.cHeiko Schocher2017-06-291-71/+1
| | | | | | | | | fix warnings: drivers/usb/gadget/at91_udc.c:1344:12: warning: 'at91rm9200_udc_init' defined but not used [-Wunused-function] drivers/usb/gadget/at91_udc.c:1379:13: warning: 'at91rm9200_udc_pullup' defined but not used [-Wunused-function] drivers/usb/gadget/at91_udc.c:1476:12: warning: 'at91sam9263_udc_init' defined but not used [-Wunused-function] Signed-off-by: Heiko Schocher <hs@denx.de>
* GE Bx50v3 boards: fix fdt file variablePeter Robinson2017-06-293-3/+3
| | | | | | | | | | | The CONFIG_DEFAULT_FDT_FILE expects just the file not a full path as that might vary depending on the variant of Linux distro you might be using. Cc: Martin Donnelly <martin.donnelly@ge.com> Cc: Fabio Estevam <festevam@gmail.com> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Acked-by: Fabio Estevam <fabio.estevam@nxp.com>
* scripts: config_whitelist: Handle lines with leading spaces/tabsBin Meng2017-06-293-119/+5
| | | | | | | | Some Kconfig options are defined in a line with leading spaces/tabs. Update build-whitelist/check-config scripts to handle such cases. Generate a new config_whitelist.txt with new scripts. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* ARM: make memset and memcpy prompt message more clearlyAndy Yan2017-06-291-2/+2
| | | | | | | | | The origin SPL_USE_ARCH_MEMSET/MEMCPY use same prompt message as USE_ARCH_MEMSET/MEMCPY, which makes it's hard to distinguish them in menuconfig interface. This patch gives them different prompt messages for spl and none-spl config. Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
* usb: gadget: Call g_dnl_bind_fixup() before testing g_dnl_serial lengthLukasz Majewski2017-06-291-1/+2
| | | | | | | | | | | | | | | | After the commit SHA1: 842778a091 - the serial number descriptor is only visible when we have non zero length of g_dnl_serial. However, on some platforms (e.g. Siemens) the serial number is set at g_dnl_bind_fixup(), so with the current code we will always omit the serial (since it is not set). This commit moves the g_dnl_bind_fixup() call before the g_dnl_serial length test. Signed-off-by: Lukasz Majewski <lukma@denx.de> Acked-by: Heiko Schocher <hs@denx.de> Tested-by: Heiko Schocher <hs@denx.de>
* ti816x: Enable ethernet supportTom Rini2017-06-287-21/+122
| | | | | | | | | | The ti816x SoC revision of the ethernet IP block is handled by the "davinci_emac" driver, rather than the "cpsw" driver as done by later members of the family. Enable the relevant plumbing. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Vitaly Wool <vitaly.wool@konsulko.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* Merge git://git.denx.de/u-boot-x86Tom Rini2017-06-277-62/+81
|\
| * Revert "x86: Convert MMC to driver model"Bin Meng2017-06-277-62/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ddb3ac3c716f56cead695444e65a7ba7b0946555. With MMC converted to driver model, SCSI driver is broken due to zero address access at (ops->read) in block_dread() function. The fix (SCSI driver converted to DM) is ready in u-boot-dm branch, but it is too late for this relese to get that in. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Merge git://www.denx.de/git/u-boot-imxTom Rini2017-06-2742-650/+912
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/imx6qdl_icore_rqs.h include/configs/imx6ul_geam.h include/configs/imx6ul_isiot.h
| * | mx6: soc: Fix typo in temperature unit nameFabio Estevam2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | The correct name is 'Celsius', so fix it accordingly. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mx6sabresd: Update to SPL only modeFabio Estevam2017-05-311-56/+28
| | | | | | | | | | | | | | | | | | | | | mx6sabresd only supports SPL mode now, so update the README file accordingly. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mx6sabresd: Update the config fileFabio Estevam2017-05-311-3/+1
| | | | | | | | | | | | | | | | | | | | | Only configs/mx6sabresd_defconfig is supported now, so update the MAINTAINERS file accordingly. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mx6sabresd: Rename target to mx6sabresd_defconfigFabio Estevam2017-05-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | As mx6sabresd only supports SPL target now, there is no need to keep the 'spl' in the name of the target, so simply rename it to mx6sabresd_defconfig. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | engicam: Generate single config fileJagan Teki2017-05-318-552/+33
| | | | | | | | | | | | | | | | | | | | | | | | Engicam has several SOM's on i.MX6 stream, where each SOM has one include/configs/*.h file, this patch generate single config file for all SOM's include/configs/imx6-engicam.h Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | engicam: Add fdt_addr env value based on cpu_typeJagan Teki2017-05-314-4/+16
| | | | | | | | | | | | | | | | | | | | | Define FDT_ADDR based on the respective SOM, and later patches will make use of this fdt_addr in single config file. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | engicam: Set console env on board_late_initJagan Teki2017-05-315-4/+5
| | | | | | | | | | | | | | | | | | Set console env on board_late_init instead of configs. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | icorem6: Remove unused FEC configsJagan Teki2017-05-311-2/+0
| | | | | | | | | | | | | | | | | | | | | - IMX_FEC_BASE: icorem6 using dts, no need for explicit base. - CONFIG_ETHPRIME: ethprime env not using anywhere in the board. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | engicam: Move PHY configs to defconfigJagan Teki2017-05-3112-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | - CONFIG_PHYLIB - CONFIG_PHY_SMSC - CONFIG_PHY_MICREL - CONFIG_PHY_MICREL_KSZ9021 Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | drivers: net: Kconfig: Add PHY_MICREL_KSZ9021 entryJagan Teki2017-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | | Add kconfig entry for Micrel KSZ9021 PHY support. Cc: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | icorem6: Recover missing nand defconfigJagan Teki2017-05-311-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | nand defconfig is accidentally removed from below commit, so recover the same. "icorem6: Make SPL to pick suitable fdt" (sha1: 15455a6b01d97d575afe2f494cfc9722424230c0) Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | engicam: Move SPL mmc configs under CONFIG_SPL_BUILDJagan Teki2017-05-314-8/+9
| | | | | | | | | | | | | | | | | | | | | - CONFIG_SYS_FSL_USDHC_NUM - CONFIG_SYS_FSL_ESDHC_ADDR Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | mmc: fsl_esdhc: Move non DM_MMC code in #ifndef CONFIG_DM_MMCJagan Teki2017-05-311-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | Don't build non DM_MMC code when DM_MMC defined so move them into #ifndef CONFIG_DM_MMC Cc: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
| * | regulator: pfuze100: unsigned compared against 0Peng Fan2017-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fix unsigned compared against 0. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| * | regulator: pfuze100: add SPDX LicensePeng Fan2017-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Add SPDX license Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
| * | mx25pdk: Set the eSDHC PER clock to 48 MHzBenoît Thébaudeau2017-05-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum SD clock frequency in High Speed mode is 50 MHz. This change makes it possible to get 48 MHz from the USB PLL (240 MHz / 5 / 1) instead of the previous 33.25 MHz from the AHB clock (133 MHz / 2 / 2). Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mx25: Add function to set PER clocksBenoît Thébaudeau2017-05-312-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Introduce the imx_set_perclk() function to make it possible to set the PER clocks. Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mx25: Fix imx_get_perclk()Benoît Thébaudeau2017-05-311-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | imx_get_perclk() used the AHB clock as the clock source for all PER clocks, but the USB PLL output can also be a PER clock source if the corresponding PER CLK MUX bit is set in CCM.MCR. Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | mmc: fsl_esdhc: Allow all supported prescaler valuesBenoît Thébaudeau2017-05-311-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On i.MX, SYSCTL.SDCLKFS may be set to 0 in order to make the SD clock frequency prescaler divide by 1 in SDR mode. In DDR mode, the prescaler can divide by up to 512. Allow both of these settings. The maximum SD clock frequency in High Speed mode is 50 MHz. On i.MX25, this change makes it possible to get 48 MHz from the USB PLL (240 MHz / 5 / 1) instead of only 40 MHz from the USB PLL (240 MHz / 3 / 2) or 33.25 MHz from the AHB clock (133 MHz / 2 / 2). Signed-off-by: Benoît Thébaudeau <benoit@wsystem.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | arm: mx6: remove unused config variable CONFIG_SPL_NAND_MXSLothar Waßmann2017-05-312-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The config variable CONFIG_SPL_NAND_MXS is only set in include/configs/imx6_spl.h but used nowhere. Remove it. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
| * | drivers: pci: imx: add imx_pcie_remove functionTim Harvey2017-05-313-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no dedicated reset signal wired up for the MX6QDL thus if the bootloader enables the link we need some special handling to get the core back into a state where it is safe to touch it for configuration. While there has been some special handling in the Linux kernel to do this, it was removed in 4.11 thus we need to do it properly in the bootloader and therefore without this if you enable PCI in the bootloader you will hang while booting the 4.11 kernel. This puts the PCIe controller back into a safe state for the kernel driver before launching the kernel. Signed-off-by: Tim Harvey <tharvey@gateworks.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Peter Senna Tschudin <peter.senna@collabora.com>
| * | mx7dsabresd: Increase CONFIG_ENV_OFFSETFabio Estevam2017-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | After running 'saveenv' we can no longer boot. Adjust CONFIG_ENV_OFFSET so that U-Boot binary and the environment section do not overlap. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
| * | pico-imx7d: Add initial supportVanessa Maegima2017-05-319-0/+650
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the initial support for pico-imx7d board based on Wig Cheng's source code. Add support for eMMC, USB gadget, I2C, PMIC and Ethernet. For more information about this board, please visit: http://www.technexion.org/products/pico/pico-som/pico-imx7-emmc Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini2017-06-261-2/+2
|\ \ \
| * | | i2c_eeprom: add static to i2c_eeprom_std_ops/probeMasahiro Yamada2017-06-261-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | These are only used in drivers/mis/i2c_eeprom.c Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | | Merge git://git.denx.de/u-boot-uniphierTom Rini2017-06-2437-373/+198
|\ \ \ | |/ / |/| | | | | | | | | | | - fix sparse warnings - sync DT with Linux - add new board support (LD11/LD20 global)
| * | arm64: dts: uniphier: add support for LD20 Global boardKunihiko Hayashi2017-06-252-0/+62
| | | | | | | | | | | | | | | | | | | | | Add initial device tree support for LD20 Global board. Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | arm64: dts: uniphier: add support for LD11 Global boardKunihiko Hayashi2017-06-252-0/+80
| | | | | | | | | | | | | | | | | | | | | Add initial device tree support for LD11 Global board. 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 next-20170622Masahiro Yamada2017-06-2524-353/+29
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: fix various sparse warningsMasahiro Yamada2017-06-2510-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings reported by sparse: - ... was not declared. Should it be static?" - cast to restricted __be32 While fixing those, the type conflict of cci500_init() was found. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-rockchipTom Rini2017-06-233-10/+5
|\ \ \
| * | | rockchip: clk: rk3036: correct setting for pll integer modeKever Yang2017-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to rk3036 TRM, pll_con1[12] should be set to '1' for the pll integer mode, while the '0' means the frac mode. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * | | rockchip: mkimage: correct spl_size for rk3399Kever Yang2017-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum spl_size for rk3399 is the internal memory size minus the size used in bootrom (which usually can get from SPL_TEXT_BASE). Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * | | rockchip: rk3399: correct SPL_MAX_SIZEKever Yang2017-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SPL_MAX_SIZE is the internal memory size minux the space used by bootrom. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
| * | | rkcommon.c: Remove unused rkcommon_spi_to_offsetTom Rini2017-06-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is unused, remove. Reported by clang-3.8. Fixes: a1c29d4b43dc ("rockchip: mkimage: set init_boot_size to avoid ...") Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>