summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-13Merge tag 'signed-efi-next' of git://github.com/agraf/u-bootTom Rini
Patch queue for efi - 2017-10-13 This is the second batch of amazing improvements for efi_loader in 2017.11: - New self tests to verify our own code - A few bug fixes - colored text support - event and SNP improvements, should get us close to iPXE working
2017-10-13efi_selftest: correctly check return valuesHeinrich Schuchardt
When cancelling the timer we should check the return value provided by the set_timer service. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-12Merge git://git.denx.de/u-boot-fsl-qoriqTom Rini
2017-10-12Merge git://www.denx.de/git/u-boot-imxTom Rini
2017-10-12ARM: imx6: Add DHCOM i.MX6 PDK board supportMarek Vasut
Add support for the DHCOM i.MX6 PDK board. This board has: - FEC ethernet - EHCI USB host - 3x SDMMC Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de>
2017-10-12imx: mx7: spl: remove redundant SATA definitionasUri Mashiach
The i.MX7 SOC doesn't include the SATA interface. Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12mx6: sys_proto: Add prototypes for imx6_pcie_toggle() functionsDiego Dorta
When compiling with W=1 errors are observed: drivers/pci/pcie_imx.c:517:12: warning: no previous prototype for ‘imx6_pcie_toggle_power’ [-Wmissing-prototypes] __weak int imx6_pcie_toggle_power(void) drivers/pci/pcie_imx.c:528:12: warning: no previous prototype for ‘imx6_pcie_toggle_reset’ [-Wmissing-prototypes] __weak int imx6_pcie_toggle_reset(void) Remove these warnings by adding the functions prototypes on arch-mx6/sys_proto. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12mx6: clock: Add a prototype for do_mx6_showclocks()Diego Dorta
When compiling with W=1 the following warning is observed: arch/arm/mach-imx/mx6/clock.c:1268:5: warning: no previous prototype for ‘do_mx6_showclocks’ [-Wmissing-prototypes] int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) Remove this warning by adding the function prototype into arch-mx6/clock.h file. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12i.mx6ul: xpress: update UART init for current board revisionAnatolij Gustschin
UART pinmux has been changed on the last board revision. Change board pinmux accordingly. Console is on UART7 now, add pinmux, base address and update console string in environment. Signed-off-by: Anatolij Gustschin <agust@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12mx6slevk: Use PARTUUID to specify the rootfs locationFabio Estevam
mx6slevk can run different kernel versions, such as NXP 4.1 or mainline. Currently the rootfs location is passed via mmcblk number and the problem with this approach is that the mmcblk number for the SD card changes depending on the kernel version. In order to avoid such issue, use the UUID method to specify the rootfs location. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12drivers: pci: imx: fix imx_pcie_remove functionSven-Ola Tuecke
We have at least a minor count of boards, that failed to re-initialize PCI express in the Linux kernel. Typical failure rate is 20% on affected boards. This is mitigated by commit 6ecbe1375671 ("drivers: pci: imx: add imx_pcie_remove function"). However, at least on some i.MX6 custom boards, when calling assert_core_reset() as part of the first-time PCIe init, read access to PCIE_PL_PFLR simply hangs. Surround this readl() with imx_pcie_fix_dabt_handler() does not help. For this reason, the forced LTSSM detection is only used on the second assert_core_reset() that is called shorly before starting the Linux kernel. Signed-off-by: Sven-Ola Tuecke <sven-ola.tuecke@numberfour.eu> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: David Müller <d.mueller@elsoft.ch>
2017-10-12wandboard: Add support for the latest revd1 revisionFabio Estevam
Latest wandboard hardware revision is revd1, which brings the following new features: - PFUZE100 PMIC - AR8035 Ethernet PHY - Upgrade Wifi/BT chip to BCM4339/BCM43430. The detection mechanism is to probe the PMIC and when it is found, then the revision of the board is revd1. As the detection is done via PMIC, we need to print the board version at a later stage via CONFIG_DISPLAY_BOARDINFO_LATE and also need to disable CONFIG_DISPLAY_BOARDINFO, which is done much earlier. Make the necessary adjustments for the AR8035 PHY to work on revd1. Based on Richard Hu's work from Technexion's U-Boot tree. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12doc: update imx_usb_loader URLStefan Agner
The changes required to use U-Boot's Serial Download Protocol implementation are now available in upstream imx_usb_loader repository. Update the URL accordingly. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-10-12arm: imx7d: add support for Compulab cl-som-imx7Ilya Ledvich
Add initial support for Compulab cl-som-imx7 SoM. The initial support includes: - MMC - eMMC - SPI flash - I2C - FEC - USB - Serial console Signed-off-by: Ilya Ledvich <ilya@compulab.co.il>
2017-10-12imx: mx7: SPL support for i.MX7Uri Mashiach
Add configuration file and spl_boot_device function for the i.MX7 SPL. Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
2017-10-12imx: mx7: DDR controller configuration for the i.MX7 architectureUri Mashiach
The configuration files imximage.cfg are used for the DDR controller configuration. Add DDR configuration function to replace the DDR controller configuration in the imximage.cfg file. The function can be used for DDR size detection. Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
2017-10-12imx: mx7: fix the CCM_ macrosUri Mashiach
The CCM_ macros use the CCM_BASE_ADDRESS macro, which doesn't exist. Replace the CCM_BASE_ADDRESS macros with CCM_BASE_ADDR. Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2017-10-12icorem6_rqs: env: Return mmc devnoJagan Teki
Instead of changing mmc devno from dts nodes better to return the detected devno so-that env trigger the same. Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
2017-10-12icore: configs: Fix merge conflict issueJagan Teki
Fix for finding mmc devices on i.MX6Q icore boards added in below comment "icorem6: Fix to find MMC devices" (sha1: a2b137b38d925df91afef52f5122927de024f81a) which is reverted in during u-boot-imx merge " Merge git://git.denx.de/u-boot-imx" (sha1: 6aee2ab68c362ace5a59f89a63abed82e0bf19e5) This patch, is recreated to fix merge conflict. Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
2017-10-12topic_miami: Remove CONFIG_CMD_BOOTZ undefFabio Estevam
CONFIG_CMD_BOOTZ option has been converted to defconfig, so there is no need to undefine it in board config file anymore. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12mx6sabresd: Include <usb/ehci-ci.h> header fileDiego Dorta
When compiling with W=1 the following warning is observed: board/freescale/mx6sabresd/mx6sabresd.c:586:5: warning: no previous prototype for ‘board_ehci_hcd_init’ [-Wmissing-prototypes] int board_ehci_hcd_init(int port) Remove this warning by including <usb/ehci-ci.h>. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12usb: ehci-ci: Add a prototype for board_ehci_power()Diego Dorta
When compiling with W=1 the following warning is observed: board/freescale/mx6sabresd/mx6sabresd.c:601:5: warning: no previous prototype for ‘board_ehci_power’ [-Wmissing-prototypes] int board_ehci_power(int port, int on) Remove this warning by adding the function prototype into usb/ehci-ci.h file. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12mx6sabresd: Include <asm/mach-imx/spi.h> header fileDiego Dorta
When compiling with W=1 the following warning is observed: board/freescale/mx6sabresd/mx6sabresd.c:680:5: warning: no previous prototype for ‘board_spi_cs_gpio’ [-Wmissing-prototypes] int board_spi_cs_gpio(unsigned bus, unsigned cs) Remove this warning by including <asm/mach-imx/spi.h>. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12mx6: soc: Include <asm/bootm.h> header fileDiego Dorta
When compiling with W=1 the following warning is observed: arch/arm/mach-imx/mx6/soc.c:213:12: warning: no previous prototype for ‘get_board_rev’ [-Wmissing-prototypes] u32 __weak get_board_rev(void) Fix the build warning by including <asm/bootm.h>. Signed-off-by: Diego Dorta <diego.dorta@nxp.com>
2017-10-12mx7ulp_evk: Move CONFIG_CMD_BOOTZ to KconfigFabio Estevam
CONFIG_CMD_BOOTZ symbol does not work in board config file anymore, so fix this by moving it to Kconfig. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2017-10-12imx: sys_proto: Add a prototype for board_mmc_get_env_dev()Diego Dorta
When compiling with W=1 the following warning is observed: board/freescale/mx6sabresd/mx6sabresd.c:266:5: warning: no previous prototype for ‘board_mmc_get_env_dev’ [-Wmissing-prototypes] int board_mmc_get_env_dev(int devno) Remove this warning by adding the function prototype into sys_proto.h file. Signed-off-by: Diego Dorta <diego.dorta@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12imx: Include <input.h> header fileDiego Dorta
When building with W=1 errors like the one below is seen: board/freescale/mx6sabresd/mx6sabresd.c:546:5: warning: no previous prototype for ‘overwrite_console’ [-Wmissing-prototypes] int overwrite_console(void) Fix the build warnings by including <input.h>. Signed-off-by: Diego Dorta <diego.dorta@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12mx6: toradex: Remove custom CONFIG_SPL_PAD_TO definitionFabio Estevam
CONFIG_SPL_PAD_TO is already defined inside "imx6_spl.h", so there is no need to redefine it in the board config files. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefan Agner <stefan.agner@toradex.com>
2017-10-12mx25pdk: Remove duplicated defineOtavio Salvador
The CONFIG_SYS_MMC_ENV_DEV is duplicated, drop it. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-10-12mx25pdk: Use generic filesystem commandsOtavio Salvador
This rework the board to use the generic filesystem commands instead of forcing the use of FAT for the boot files. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2017-10-12README.imx6: Prefer loading SPL via the new SDP mechanismFabio Estevam
Now that it is possible to load SPL and u-boot.img via imx_usb_loader tool, mention this method instead of the old one that relied on ymodem. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12mx53loco: Let CONFIG_DISPLAY_CPUINFO be selectedFabio Estevam
With CONFIG_DISPLAY_CPUINFO=y we get a "Reset cause" line, which brings important information of the reboot cause. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12imx6: disable clock command and print_cpuinfo code in SPLAnatolij Gustschin
We do not use print_cpuinfo and clock command code in SPL, disable it when building SPL image. Signed-off-by: Anatolij Gustschin <agust@denx.de>
2017-10-12colibri_imx6: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12apalis_imx6: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-10-12mx6cuboxi: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12wandboard: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12cgtqmx6eval: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12mx6sabresd: Avoid calling setup_display() from SPL codeFabio Estevam
There is no need call setup_display() from SPL code, so move it to board_init(), which executes only in U-Boot proper. Reported-by: Stefano Babic <sbabic@denx.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
2017-10-12efi_loader: console support for color attributesRob Clark
Shell.efi uses this, and supporting color attributes makes things look nicer. Map the EFI fg/bg color attributes to ANSI escape sequences. Not all colors have a perfect match, but spec just says "Devices supporting a different number of text colors are required to emulate the above colors to the best of the device’s capabilities". Signed-off-by: Rob Clark <robdclark@gmail.com> Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Alexander Graf <agraf@suse.de> [agraf: s/unsigned/unsigned int/] Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-12efi_loader: Add mem-mapped for fallbackRob Clark
When we don't have a real device/image path, such as 'bootefi hello', construct a mem-mapped device-path. This fixes 'bootefi hello' after devicepath refactoring. Fixes: 95c5553ea2 ("efi_loader: refactor boot device and loaded_image handling") Signed-off-by: Rob Clark <robdclark@gmail.com> Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-11Merge git://git.denx.de/u-boot-i2cTom Rini
2017-10-11i2c: muxes: pca954x: look up width from chip_descChris Packham
Commit 8e6eda7cda6c ("drivers/i2c/muxes/pca954x: Add pca9547 I2C mux support") introduced a chip_desc for the pca954x devices but failed to update pca954x_ofdata_to_platdata() to be aware of it. Make pca954x_ofdata_to_platdata() lookup the chip_desc to validate the device width. Signed-off-by: Chris Packham <judge.packham@gmail.com> Reviewed-by: Marek Behun <marek.behun@nic.cz>
2017-10-10Merge branch 'rmobile' of git://git.denx.de/u-boot-shTom Rini
2017-10-10configs: Re-sync CONFIG_CMD_IMLS with moveconfigTuomas Tynkkynen
The option is specified in Kconfig, but still a few config header files are overriding the choice by #undef'ing it. Re-sync the option with moveconfig to rid of the #undefs. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
2017-10-10cmd: Toggle the default value of CONFIG_CMD_IMLSTuomas Tynkkynen
Having this as a 'default y' is rather annoying because it doesn't actually compile unless other options are defined in the board header: ../cmd/bootm.c: In function 'do_imls_nor': ../cmd/bootm.c:330:7: error: 'CONFIG_SYS_MAX_FLASH_BANKS' undeclared (first use in this function); did you mean 'CONFIG_SYS_MAX_FLASH_SECT'? i < CONFIG_SYS_MAX_FLASH_BANKS; ++i, ++info) { Make it 'default n' so people who develop new boards that start from a blank defconfig have one less compilation failure to debug. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
2017-10-10efi_loader: don't increment part twice per loopJonathan Gray
Correct a mistake in the part number handling of commit 16a73b249d138fedeb188710533902ed7aac1ddc and only increment part once per loop. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Tested-by: Peter Robinson <pbrobinson@gmail.com> Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-10efi_loader: MAX_UTF8_PER_UTF16 = 3Heinrich Schuchardt
The constant MAX_UTF8_PER_UTF16 is used to calculate required memory when converting from UTF-16 to UTF-8. If this constant is too big we waste memory. A code point encoded by one UTF-16 symbol is converted to a maximum of three UTF-8 symbols, e.g. 0xffff could be encoded as 0xef 0xbf 0xbf. The first byte carries four bits, the second and third byte carry six bits each. A code point encoded by two UTF-16 symbols is converted to four UTF-8 symbols. So in this case we need a maximum of two UTF-8 symbols per UTF-16 symbol. As the overall maximum is three UTF-8 symobls per UTF-16 symbol we need MAX_UTF8_PER_UTF16 = 3. Fixes: 78178bb0c9d lib: add some utf16 handling helpers Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-10efi_loader: search all possible disk partitionsJonathan Gray
When searching for partitions don't stop if a partition is not present for a given partition number as there may be valid partitions after. Search for up to MAX_SEARCH_PARTITIONS matching the other callers of part_get_info(). This allows OpenBSD to boot via the efi_loader on rpi_3 again after changes made after U-Boot 2017.09. With MBR partitioning OpenBSD will by default use the fourth partition for the 0xA6 (OpenBSD) partition. Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Signed-off-by: Alexander Graf <agraf@suse.de>
2017-10-09Merge git://git.denx.de/u-boot-dmTom Rini
generated by cgit (git 2.34.1) at 2025-01-01 02:56:35 +0000