aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-08x86: Move commands from under arch/x86 to cmd/x86/Tom Rini
We only need to compile and link these files when building for full U-Boot. Move them to under cmd/x86/ to make sure they aren't linked in and undiscarded due to u_boot_list_2_cmd_* being included). Cc: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
2018-01-03Merge git://git.denx.de/u-boot-rockchipTom Rini
2018-01-03rockchip: firefly-rk3399: enable SPL_ATF_NO_PLATFORM_PARAMPhilipp Tomsich
The Rockchip-released ATF for the Firefly apparently (i.e. Kever reported this) does not tolerate a FDT being passed as the platform parameter and will run into a hard stop. To work around this limitation in the ATF parameter handling, we enable SPL_ATF_NO_PLATFORM_PARAM (which will force passing NULL for the platform parameters). Note that this only affects this platform, as the ATF releases for the RK3368 and RK3399 have always either ignored the platform parameter (i.e. before the FDT-based parameters were supported) or support receiving a pointer to a FDT. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-03spl: atf: add SPL_ATF_NO_PLATFORM_PARAM optionPhilipp Tomsich
While we expect to call a pointer to a valid FDT (or NULL) as the platform parameter to an ATF, some ATF versions are not U-Boot aware and have an insufficiently robust (or an overzealour) parameter validation: either way, this may cause a hard-stop with uncooperative ATF versions. This change adds the option to suppress passing a platform parameter and will always pass NULL. Debug output from ATF w/ this option disabled (i.e. default): INFO: plat_param_from_bl2: 0x291450 Debug output from ATF w/ this option enabled: INFO: plat_param_from_bl2: 0 Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
2018-01-03video: Support multiple lines version string displayPeng Fan
The calculation of left space for version string is not correct, should use VIDEO_COLS not VIDEO_LINE_LEN / 2, otherwise we will get larger space than actual have and cause string to overlay logo picture. Also current version string display only supports two lines words at max. This also causes overlay when the LCD pixel column size is not enough. Signed-off-by: Peng Fan <peng.fan@nxp.com> Tested-by: Anatolij Gustschin <agust@denx.de>
2018-01-03video: ipu: Fix dereferencing NULL pointer problemPeng Fan
The clk_set_rate function dereferences the clk pointer without checking whether it is NULL. This may cause problem when clk is NULL. Signed-off-by: Peng Fan <peng.fan@nxp.com> Signed-off-by: Anatolij Gustschin <agust@denx.de>
2018-01-02rockchip: board: lion-rk3368: reduce env-size default to 8KiBPhilipp Tomsich
We want to have the same configuration defaults for the RK3368-uQ7 as for the RK3399-Q7: this change reduces the default env-size to 8KiB to ensure that it does not overlap the boot-payload on SD/MMC configurations. References: commit fe529e6597c0 ("rockchip: rk3399-puma: reduce env size to 8kiB") Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2018-01-02boards: amlogic: khadas-vim: Typo fixupNeil Armstrong
Khadas VIM is an Open Source DIY Box manufactured by Shenzhen Wesion NOT 'Tomato' The fix was provided by Khadas Team member 'numbqq'. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
2018-01-01Prepare v2018.01-rc3Tom Rini
Signed-off-by: Tom Rini <trini@konsulko.com>
2018-01-01Merge branch 'master' of git://git.denx.de/u-boot-rockchipTom Rini
2018-01-01power: tps65910: replace error() by pr_err()Felix Brack
The patch replaces the former error() by the new pr_err(). This makes the TPS65910 driver conform to Masahiro's patch 'treewide:replace with error() with pr_err()' introduced October 2017. Signed-off-by: Felix Brack <fb@ltec.ch> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-01-01configs: am335x_boneblack: Bring back missed bootcmdSam Protsenko
Commit b6251db8c3f0 ("Kconfig: Introduce USE_BOOTCOMMAND and migrate BOOTCOMMAND") removed CONFIG_BOOTCOMMAND option from include/configs/am335x_evm.h file. But that option wasn't added to defconfig files for BeagleBone Black board. Because of this we can't boot Linux from SD card using just "run bootcmd", getting next error: ** File not found /boot/undefined ** That's because "fdtfile" variable has "undefined" value by default, and "bootcmd" doesn't call "run findfdt" command, which assigns "fdtfile" to correct device tree file for current board name (obtained from EEPROM). So we are forced to either call "run findfdt" command manually, or assign manually "fdtfile=am335x-boneblack.dtb" (e.g. in uEnv.txt file). Bring back CONFIG_BOOTCOMMAND to BBB defconfigs so that we can boot Linux rootfs from SD card automatically without any addition actions. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
2018-01-01dm: core: remove orphaned parameter description in platdata.hHeinrich Schuchardt
struct driver_info has no field 'flags'. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2018-01-01ARM: omap3: evm: Refactor 'board_eth_init'Derald D. Woods
This commit clears 'ethaddr' before calling 'smc911x_initialize' to allow the SROM MAC address to be assigned properly. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
2018-01-01ARM: dts: omap3-evm: Enable DM and devicetree for TMDSEVM{3530, 3730}Derald D. Woods
This commit updates the configuration files needed to support OF_CONTROL on the OMAP3 EVM baseboard. Additionally: - CONFIG_SYS_THUMB_BUILD is enabled - CONFIG_SPL_ENV_SUPPORT is enabled Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
2018-01-01ARM: dts: omap3-evm: Add support for TMDSEVM{3530, 3730}Derald D. Woods
This commit adds OMAP3 EVM devicetree files from Linux v4.15-rc3. Note that this is the first addition of OMAP34XX devicetree files. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
2018-01-01ARM: omap3: evm: Do not relocate FDT addressDerald D. Woods
This commit keeps the 'fdtaddr' as provided by DEFAULT_LINUX_BOOT_ENV. Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
2018-01-01rockchip: dts: rk3399-evb: support boot from sd-cardKever Yang
Enable sdmmc node in SPL and add it to boot order. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [Fixed commit tags:] Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2018-01-01rockchip: rk3399-puma: reduce env size to 8kiBJakob Unterwurzacher
This commit changes the size of the enviroment (for the RK3399-Q7) to 8kiB for all possible locations of the environment (i.e. even when the environment is saved to SD card). With the default of 32kiB, the environment overwrites the SPL stage which lives at 16kiB. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [Reworked commit-message:] Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2017-12-29Merge git://git.denx.de/u-boot-imxTom Rini
2017-12-29arm: imx: add tzic interrupt controller for imx53Patrick Bruenn
Since commit 999a78d5cf00 ("scripts/dtc: Update to upstream version v1.4.5-3-gb1a60033c110") dtc warns about: arch/arm/dts/imx53-cx9020.dtb: Warning (interrupts_property): Missing interrupt-parent for /soc/aips@50000000/serial@53fc0000 arch/arm/dts/imx53-cx9020.dtb: Warning (interrupts_property): Missing interrupt-parent for /soc/aips@50000000/ccm@53fd4000 arch/arm/dts/imx53-cx9020.dtb: Warning (interrupts_property): Missing interrupt-parent for /soc/aips@50000000/gpio@53fe4000 arch/arm/dts/imx53-cx9020.dtb: Warning (interrupts_property): Missing interrupt-parent for /soc/aips@60000000/sdma@63fb0000 arch/arm/dts/imx53-cx9020.dtb: Warning (interrupts_property): Missing interrupt-parent for /soc/aips@60000000/ethernet@63fec000 Fix this by adding a node for the tzic interrupt controller. Copied from "<Linux>/arch/arm/boot/dts/imx53.dts" Signed-off-by: Patrick Bruenn <p.bruenn@beckhoff.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29ARM: imx6: Disable DDR DRAM calibration DHCOM i.MX6 PDKMarek Vasut
The DDR DRAM calibration doesn't work on T-topology sometimes, so disable it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de>
2017-12-29imx: Fix missing spl_sd configuration for wandboard.Vagrant Cascadian
In commit 6e6cf015e7cdd7ca83a933320a81201972bd5e5e ("Merge git://www.denx.de/git/u-boot-imx") the line defining spl_sd configuration for wandboard was removed, which resulted in no SPL target being built. Add it back. Signed-off-by: Vagrant Cascadian <vagrant@debian.org> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29imx: Kconfig: Add HAS_CAAM optionBreno Lima
Currently CONFIG_SECURE_BOOT is selecting FSL_CAAM for all i.MX devices, this causes the following error when building mx6sl boards since this SoC doesn't have the CAAM block: In file included from drivers/crypto/fsl/jobdesc.c:12:0: drivers/crypto/fsl/jobdesc.c: In function 'inline_cnstr_jobdesc_blob_dek': include/fsl_sec.h:268:25: error: 'CAAM_ARB_BASE_ADDR' undeclared (first use in this function) #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ include/fsl_sec.h:268:25: note: each undeclared identifier is reported only once for each function it appears in #define SEC_MEM_PAGE1 (CAAM_ARB_BASE_ADDR + 0x1000) ^ drivers/crypto/fsl/jobdesc.c:140:21: note: in expansion of macro 'SEC_MEM_PAGE1' memcpy((uint32_t *)SEC_MEM_PAGE1, (uint32_t *)plain_txt, in_sz); ^ scripts/Makefile.build:280: recipe for target 'drivers/crypto/fsl/jobdesc.o' failed make[3]: *** [drivers/crypto/fsl/jobdesc.o] Error 1 scripts/Makefile.build:425: recipe for target 'drivers/crypto/fsl' failed make[2]: *** [drivers/crypto/fsl] Error 2 scripts/Makefile.build:425: recipe for target 'drivers/crypto' failed make[1]: *** [drivers/crypto] Error 2 Add HAS_CAAM configuration to avoid this error. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29Kconfig: mx6ull: Deselect MX6UL from CONFIG_MX6ULLBreno Lima
MX6UL contains features that MX6ULL doesn't support. Deselect CONFIG_MX6UL and select SYS_L2CACHE_OFF and ROM_UNIFIED_SECTIONS. The motivation for doing this change is that MX6UL supports CAAM and MX6ULL does not. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29mx6sl: Select MX6SL option via KconfigBreno Lima
Currently the MX6SL option is selected via CONFIG_SYS_EXTRA_OPTIONS, but it is better to select it directly via Kconfig. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
2017-12-29warp: imximage.cfg: Handle the CONFIG_SECURE_BOOT caseBreno Lima
Secure boot is not enabled in warp imximage.cfg, add support for it. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29mx6slevk: imximage.cfg: Handle the CONFIG_SECURE_BOOT caseBreno Lima
Secure boot is not enabled in mx6slevk imximage.cfg, add support for it. Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Peng Fan <peng.fan@nxp.com>
2017-12-29mx6sxsabresd: Load the correct dtb for revA boardFabio Estevam
Currently only imx6sx-sdb.dtb is loaded, but if revA board is used the correct dtb is imx6sx-sdb-reva.dtb, so make this possible. While at it, remove an extra 'mmc dev'. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29imx: Add a common way for detecting NXP boards revisionFabio Estevam
NXP development boards based on i.MX6/i.MX7 contain the board revision information stored in the fuses. Introduce a common function that can be shared by different boards and convert mx6sabreauto to use this new mechanism. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29ARM: imx: display5: config: Update display5_factory_defconfig to use ↵Lukasz Majewski
USE_BOOTCOMMAND This commit switch display5_factory_defconfig to use new, generic USE_BOOTCOMMAND Kconfig option. Signed-off-by: Lukasz Majewski <lukma@denx.de>
2017-12-29power: pmic.h: include dm/ofnode.hPeng Fan
Include dm/ofnode.h. Signed-off-by: Peng Fan <peng.fan@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29ARM: imx: cm_fx6: remove esdhc init code from board fileChristopher Spinrath
Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") enabled driver model support for MMC. Remove the old mmc init code, which is no longer used, from the board file. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-12-29ARM: imx: cm_fx6: remove sata init code from board fileChristopher Spinrath
Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") enabled driver model support for AHCI. Remove the old, now unused, sata init code from the board file. Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-12-29ARM: imx: cm_fx6: defconfig: enable CONFIG_DM_KEYBOARDChristopher Spinrath
Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") enabled driver model support for USB. But it missed to enable driver model support for keyboards. As a result, USB keyboards do no longer work. Fix this by enabling driver model support for keyboards. Fixes: 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-12-29ARM: imx: cm-fx6: reinstate USB support by syncing the devicetree with LinuxChristopher Spinrath
Commit 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") enabled driver model support for USB, thereby effectively removing USB support because the cm_fx6 devicetree in the U-Boot does *not* enable the USB nodes. Reinstate the USB support by syncing the devicetree with Linux whose devicetree enables the USB nodes properly. More precisely, use the devicetree found in Linux v4.15-rc1 with the following two changes: 1) Remove the audio mux; the required dt-bindings header is not present in the U-Boot. 2) Keep the usdhc3 MMC controller node currently present in the U-Boot's devicetree to retain the ability to boot from MMC. Fixes: 5248930ebf48 ("dm: imx: cm_fx6: Enable more driver model support") Signed-off-by: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29board: ge: mx53ppd: Move check_time() to common locationMartyn Welch
We are going to be using check_time() on more than the mx53ppd, move this function to a common location. Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>
2017-12-29mx6_common: remove dead codeAdam Ford
There is an #ifdef and #endif with nothing in between. This patch simply removes this dead/useless code. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
2017-12-29imx: Unify CONFIG_BOOTDELAYFabio Estevam
In order to provide a consistent user experience for imx board users, remove the custom CONFIG_BOOTDELAY values from defconfig files, so that all boards can use the default two second delay. Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Lukasz Majewski <lukma@denx.de>
2017-12-27Merge git://git.denx.de/u-boot-dmTom Rini
2017-12-26Move CONFIG_PANIC_HANG to KconfigMasahiro Yamada
Freescale (NXP) boards have lots of defconfig files per board. I used "imply PANIC_HANG" for them. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: York Sun <york.sun@nxp.com>
2017-12-24boards: ls1046ardb: disable unavailable "ethernet" node in dtsPrabhakar Kushwaha
Linux device tree contains "ethernet" node for all possible interface supported by SoC i.e. LS1046A. It is not necessary for a SerDes protocol to support all possible interface. So disable unavailable "ethernet" node in device tree. Also, enable FDT_SEQ_MACADDR_FROM_ENV to fetch MAC address sequentially from environment variables Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
2017-12-24arm: Add support of updating dts before fix-upPrabhakar Kushwaha
"ethernet" node fix-up for device tree happens before Linux boot. There can be requirement of updating "ethernet" node even before fix-up. So, add support of updating "ethernet" node. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
2017-12-24common: Fix-up MAC addr in dts by fetching env variable seriallyPrabhakar Kushwaha
The MAC addresses get fixed in the device tree for "ethernet" nodes is by using trailing number behind "ethernet" found in "/aliases". It may not be necessary for the "ethernet" nodes to be sequential. There can be gaps in between or any node disabled So provide a support to fetch MAC addr sequentially from env and apply them to "ethernet" nodes in the order they appear in device tree only if "ethernet" is not "disabled" Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
2017-12-21Merge git://git.denx.de/u-boot-x86Tom Rini
2017-12-21x86: tangier: Use official ACPI HID for FLIS IPAndy Shevchenko
FLIS IP since now gets its own ACPI ID. Drop PRP0001 workaround in favour of official ACPI HID. Corresponding kernel commit dabd4bc6de2b pinctrl: intel: merrifield: Introduce ACPI device table in the pin control subsystem tree [1] targeting v4.16. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=dabd4bc6de2b Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
2017-12-19Merge git://git.denx.de/u-boot-spiTom Rini
2017-12-19Merge git://git.denx.de/u-boot-sunxiTom Rini
2017-12-19efi_loader: Setup logical_partition media informationEmmanuel Vadot
When adding a partition, set the logical_partition member in the media structure as mandated by the UEFI spec. Signed-off-by: Emmanuel Vadot <manu@freebsd.org> Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2017-12-19mtd/spi: fix block count for is25lq040bSean Nyekjaer
This spi-nor is 4Mbit/512KB Fixes: b4fbcbc5a5 ("mtd/spi: add support for is25lq040b") Signed-off-by: Sean Nyekjaer <sean.nyekjaer@prevas.dk> Reviewed-by: Jagan Teki <jagan@openedev.com>