summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
...
* | Merge git://git.denx.de/u-boot-fdtTom Rini2016-10-13-78/+119
|\ \ | |/ |/|
| * libfdt: Drop inlining of fdt_path_offset()Simon Glass2016-10-13-4/+1
| | | | | | | | | | | | | | The fdt_path_offset() function is not inlined in upstream libfdt. Adjust U-Boot's version to match. Signed-off-by: Simon Glass <sjg@chromium.org>
| * libfdt: Sync fdt_for_each_subnode() with upstreamSimon Glass2016-10-13-11/+14
| | | | | | | | | | | | | | | | | | | | | | The signature for this macro has changed. Bring in the upstream version and adjust U-Boot's usages to suit. Signed-off-by: Simon Glass <sjg@chromium.org> Update to drivers/power/pmic/palmas.c: Signed-off-by: Keerthy <j-keerthy@ti.com> Change-Id: I6cc9021339bfe686f9df21d61a1095ca2b3776e8
| * libfdt: Bring in upstream stringlist functionsSimon Glass2016-10-13-33/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These have now landed upstream. The naming is different and in one case the function signature has changed. Update the code to match. This applies the following upstream commits by Thierry Reding <treding@nvidia.com> : 604e61e fdt: Add functions to retrieve strings 8702bd1 fdt: Add a function to get the index of a string 2218387 fdt: Add a function to count strings Signed-off-by: Simon Glass <sjg@chromium.org>
| * libfdt: Sync up with upstreamSimon Glass2016-10-13-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes small changes to the following functions, from upstream commit 6d1832c: - fdt_get_max_phandle() (upstream commit 84e0e134) - fdt_node_check_compatible (upstream commit 53bf130b) - fdt_setprop_inplace_namelen_partial() to remove useless brackets and use idx instead of index - _fdt_resize_property() to use idx instead of index - _fdt_splice() (upstream commit d4c7c25c) It also includes various typo fixes in libfdt.h Signed-off-by: Simon Glass <sjg@chromium.org>
| * cmd/fdt: add possibilty to have 'extrasize' on fdt resizeHannes Schmelzer2016-10-13-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes devicetree nodes and or properties are added out of the u-boot console, maybe through some script or manual interaction. The devicetree as loaded or embedded is quite small, so the devicetree has to be resized to take up those new nodes/properties. In original the devicetree was only extended by effective 4 * add_mem_rsv. With this commit we can add an argument to the "fdt resize" command, which takes the extrasize to be added. Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com> Signed-off-by: Hannes Schmelzer <oe5hpm@oevsv.at> Acked-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2016-10-13-0/+3
|\ \ | |/ |/|
| * driver: net: cpsw: add support for RGMII id mode support and RMII clock ↵Mugunthan V N2016-10-13-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | source selection cpsw driver supports only selection of phy mode in control module but control module has more setting like RGMII ID mode selection, RMII clock source selection. So ported to cpsw-phy-sel driver from kernel to u-boot. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * include: configs: am335x: add Atheros phy supportMugunthan V N2016-10-13-0/+2
| | | | | | | | | | | | | | | | | | In AM335x GP EVM, Atheros 8031 phy is used, enable the driver as AM335x SoC RGMII delay mode has to be enabled in phy as mentioned in the silicon errata Advisory 1.0.10 Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | Merge branch 'master' of http://git.denx.de/u-boot-mmcTom Rini2016-10-13-5/+3
|\ \
| * | mmc: dw_mmc: remove the unnecessary arguments for dwmci_setup_cfgJaehoon Chung2016-10-10-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Some arguments don't need to pass to dwmci_setup_cfg. They are already included in dwmci_host structure. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | Merge git://git.denx.de/u-boot-dmTom Rini2016-10-12-1/+70
|\ \ \ | |_|/ |/| |
| * | cmd: cros_ec: Move crosec commands to cmd subdirectoryMoritz Fischer2016-10-11-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move crosec commands from drivers/misc/cros_ec.c to cmd/cros_ec.c Acked-by: Simon Glass <sjg@chromium.org> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com> Cc: Simon Glass <sjg@chromium.org> Cc: Heiko Schocher <hs@denx.de> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Miao Yan <yanmiaobest@gmail.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Stefan Roese <sr@denx.de> Cc: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Nishanth Menon <nm@ti.com> Cc: u-boot@lists.denx.de
| * | sandbox/fs: Free memory allocated by os_dirent_lsStefan Brüns2016-10-11-1/+10
| | | | | | | | | | | | | | | Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Acked-by: Simon Glass <sjg@chromium.org>
| * | power: pmic: lp873x: Add the base pmic supportKeerthy2016-10-11-0/+19
| | | | | | | | | | | | | | | | | | | | | Add support to bind the regulators/child nodes with the pmic. Signed-off-by: Keerthy <j-keerthy@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | power: pmic: Palmas: Add the base pmic supportKeerthy2016-10-11-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to bind the regulators/child nodes with the pmic. Also adds the pmic i2c based read/write funtions to access pmic registers. Signed-off-by: Keerthy <j-keerthy@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | power: regulator: Add ctrl_reg and volt_reg fields for pmicKeerthy2016-10-11-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ctrl reg contains bit fields to enable and disable regulators, and volt_reg has the bit fields to configure the voltage values. The registers are frequently accessed hence make them part of dm_regulator_uclass_platdata structure. Signed-off-by: Keerthy <j-keerthy@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | power: regulator: Add support for gpio regulatorsKeerthy2016-10-11-0/+1
| |/ | | | | | | | | | | | | | | | | Add support for gpio regulators. As of now this driver caters to gpio regulators with one gpio. Supports setting voltage values to gpio regulators and retrieving the values. Signed-off-by: Keerthy <j-keerthy@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-x86Tom Rini2016-10-12-37/+55
|\ \
| * | x86: Clean up unused macros in the configuration headersBin Meng2016-10-12-26/+3
| | | | | | | | | | | | | | | | | | | | | Legacy video driver macros are not needed. Clean them up. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | x86: coreboot: Convert to use DM coreboot video driverBin Meng2016-10-12-3/+3
| | | | | | | | | | | | | | | | | | | | | This converts coreboot to use DM framebuffer driver. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | vbe: Make vbe_setup_video_priv() publicBin Meng2016-10-12-0/+4
| | | | | | | | | | | | | | | | | | | | | vbe_setup_video_priv() might be useful to other drivers. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | x86: Convert to use DM VESA video driverBin Meng2016-10-12-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | At present only chromebook boards are converted to DM video. Other x86 boards are still using the legacy cfb_console driver. This switches to use DM version drivers. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | x86: Don't export interrupt handlers with x86_64Simon Glass2016-10-11-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We don't have a way of adjusting these at present so it is best to refuse to export these functions. This can be implemented later if the API is required. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | elf: Add the Elf64_Rela typeSimon Glass2016-10-11-0/+6
| | | | | | | | | | | | | | | | | | | | | Add this so that we can support 64-bit relocation on x86. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | Add _image_binary_end section declarationSimon Glass2016-10-11-0/+1
| | | | | | | | | | | | | | | | | | | | | This is used in some link scripts, so add a declaration for it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: Adjust config to support DM_VIDEOSimon Glass2016-10-11-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update the common configuration so that it works correctly when CONFIG_DM_VIDEO is enabled. This involves dropping the legacy CONFIG_VIDEO option and changing the stdio device from "vga" to "vidconsole". Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | dm: video: Add driver-model support to vesa graphicsSimon Glass2016-10-11-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a function to run the Vesa BIOS for a given PCI device and obtain the resulting configuration (e.g. display size) for use by the video uclass. This makes it easier to write a video driver that uses vesa and supports driver model. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | dm: core: Add a function to get a uclass nameSimon Glass2016-10-11-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | It is useful in debug() statements to display the name of the uclass for a device. Add a simple function to provide this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | list: Add list_last_entry() to find the last entrySimon Glass2016-10-11-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | We have list_first_entry() but in some cases it is useful to find the last item added to the list. Add a macro for this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * | x86: baytrail: Add 2nd eMMC controller to the PCI probe listStefan Roese2016-10-11-2/+3
| |/ | | | | | | | | | | | | | | | | | | With this addition, the eMMC device available on the congatec and DFI BayTrail SoM is detected correctly. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-tegraTom Rini2016-10-12-0/+2
|\ \
| * | tegra: usb gadget: fix ci udc operation if not hostpc capableMarcel Ziswiler2016-10-10-0/+2
| |/ | | | | | | | | | | | | | | | | | | The Tegra 2 aka T20 is not host PC capable. Therefore gate the define CONFIG_CI_UDC_HAS_HOSTPC in tegra-common-usb-gadget.h in case of CONFIG_TEGRA20. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-uniphierTom Rini2016-10-12-11/+11
|\ \
| * | reset: declare fdtdec_phandle_args as struct to fix warningMasahiro Yamada2016-10-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The of_xlate() callback needs to know fdtdec_phandle_args is struct. Otherwise, the following warning is displayed. include/reset-uclass.h:40:11: warning: 'struct fdtdec_phandle_args' declared inside parameter list struct fdtdec_phandle_args *args); ^ include/reset-uclass.h:40:11: warning: its scope is only this definition or declaration, which is probably not what you want Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: define CONFIG_SMC911X along with CONFIG_MICRO_SUPPORT_CARDMasahiro Yamada2016-10-10-7/+7
| | | | | | | | | | | | | | | | | | | | | This is an on-board Ethernet device. It has no point if the Micro Support Card is not available. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: enable CONFIG_SYS_NO_FLASH if no CONFIG_MICRO_SUPPORT_CARDMasahiro Yamada2016-10-10-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | NOR flash devices are seldom used on UniPhier platforms these days. The only use case I see is the Micro Support Card is connected. Otherwise, define CONFIG_SYS_NO_FLASH to disable NOR FLASH. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * | ARM: uniphier: fix typos in a comment blockMasahiro Yamada2016-10-10-1/+1
| |/ | | | | | | Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | Merge git://www.denx.de/git/u-boot-marvellTom Rini2016-10-12-0/+103
|\ \
| * | arm: kirkwood: add support for Synology DS109 boardWalter Schweizer2016-10-09-0/+103
| |/ | | | | | | | | | | | | | | | | Synology DS109 is based on MV88F6281. The code is based on Dreamplug code with modificatons from Synologys open source repository. Signed-off-by: Walter Schweizer <swwa@users.sourceforge.net> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge git://git.denx.de/u-boot-fsl-qoriqTom Rini2016-10-12-47/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/ls1021aqds.h include/configs/ls1021atwr.h
| * | board: ls1012afrdm: overwrite CONFIG_EXTRA_ENV_SETTINGSPratiyush Srivastava2016-10-07-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LS1012AFRDM has 512MB of DDR. So update kernel load address to 0x96000000. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com> [York Sun: Reformatted commit message] Reviewed-by: York Sun <york.sun@nxp.com>
| * | armv8: ls1012a: Updating CONFIG_EXTRA_ENV_SETTINGSPratiyush Srivastava2016-10-07-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove ramdisk_addr, ramdisk_size and update UART baud-rate. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
| * | armv7: ls1021a: Move DDR config options to KconfigYork Sun2016-10-06-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move DDR3, DDR4 and related config options to Kconfig and clean up existing uses. Signed-off-by: York Sun <york.sun@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | armv8: fsl-layerscape: Move DDR config options to KconfigYork Sun2016-10-06-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move DDR3, DDR4 and realted options to Kconfig and clean up existing uses. Signed-off-by: York Sun <york.sun@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | arm: Move SYS_FSL_SRDS_* and SYS_HAS_SERDES to KconfigYork Sun2016-10-06-19/+0
| | | | | | | | | | | | | | | | | | | | | Move these options to Kconfig and clean up existing uses. Signed-off-by: York Sun <york.sun@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | arm: Move FSL_LSCH2 FSL_LSCH3 to KconfigYork Sun2016-10-06-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Move these options to Kconfig and create a sub-menu to avoid name conflict with other architectures. Signed-off-by: York Sun <york.sun@nxp.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | ARMv7: LS102xA: Move two macros from header files to KconfigHongbo Zhang2016-10-06-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following commits 217f92b and 1544698, these two config CPU_V7_HAS_NONSEC and CPU_V7_HAS_VIRT are moved to Kconfig, for correctly select ARMV7_PSCI. Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com> [York Sun: Reformatted commit message] Reviewed-by: York Sun <york.sun@nxp.com>
| * | fsl_sfp : Modify macros as per changes in SFP v3.4Sumit Garg2016-10-06-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | SFP v3.4 supports 8 keys in SRK table which leads to corresponding changes in OSPR key revocation field. So modify OSPR_KEY_REVOC_XXX macros accordingly. Signed-off-by: Sumit Garg <sumit.garg@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>
| * | armv7: LS1021a: enable i-cache in start.SXiaoliang Yang2016-10-06-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete CONFIG_SKIP_LOWLEVEL_INIT define in ls1021atwr.h and ls1021aqds.h can let it run cpu_init_cp15 to enable i-cache. First stage of u-boot can run faster after that. There is a description about skip lowlevel init in board/freescale/ls1021atwr/README. Signed-off-by: Xiaoliang Yang <xiaoliang.yang@nxp.com> Reviewed-by: York Sun <york.sun@nxp.com>