summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of http://git.denx.de/u-boot-mmcTom Rini2016-10-28-17/+39
|\
| * mmc: sdhci: assign to clk_mul when host version is upper than SD3.0Jaehoon Chung2016-10-28-3/+5
| | | | | | | | | | | | To prevent the wrong value check the SD version. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| * mmc: add the device name in debugging message for supplying vmmcJaehoon Chung2016-10-28-1/+1
| | | | | | | | | | | | | | | | If vmmc didn't supply, we didn't know which card didn't supply vmmc. And changed from "put" to "debug". Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Peng Fan <peng.fan@nxp.com>
| * dm: mmc: socfpga: fix MMC_OPS supportSylvain Lesne2016-10-28-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Now that CONFIG_BLK and CONFIG_MMC_OPS are enabled by default with CONFIG_DM_MMC, the DWMMC driver on the socfpga platform fails at runtime. This adds the missing fields in the driver declaration. Signed-off-by: Sylvain Lesne <lesne@alse-fr.com> Acked-by: Marek Vasut <marex@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
| * mmc: refactor two core functionsMasahiro Yamada2016-10-28-13/+2
| | | | | | | | | | | | Drop unneeded variables and assignments. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
| * mmc: sdhci: fix the "misaligned operation at range" for cacheJaehoon Chung2016-10-28-0/+1
| | | | | | | | | | | | | | | | This pathc is fixed the below thing. If misaligned the cache range, Just flush to CACHLINE_SIZE. "CACHE: Misaligned operation at range [7ae55b00, 7ae55b08]" Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
| * mmc: introduce mmc_power_initPeng Fan2016-10-28-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In device tree, there is vmmc-supply property for SD/MMC. Introduce mmc_power_init function to handle vmmc-supply. mmc_power_init will first invoke board_mmc_power_init to avoid break boards which already implement board_mmc_power_init. If DM_MMC and DM_REGULATOR is defined, the regulator will be enabled to power up the device. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Jaehoon Chung <jh80.chung@samsung.com>
* | pci: Move CONFIG_PCI_PNP to KconfigBin Meng2016-10-28-183/+11
| | | | | | | | | | | | | | | | | | | | Introduce CONFIG_PCI_PNP in Kconfig and move over boards' defconfig to use that. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com> [trini: Re-generate configs and include/configs/ changes] Signed-off-by: Tom Rini <trini@konsulko.com>
* | drivers/pci/Kconfig: Add PCITom Rini2016-10-27-155/+213
|/ | | | | | | Add 'PCI' as a menu option and migrate all existing users. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com>
* i2c: designware: Avoid overwriting the cmd_data registerMarek Vasut2016-10-24-6/+17
| | | | | | | | | | | | | | | | | | Make sure the driver writes the cmd_data register only once per read transfer instead of doing so potentially repeatedly. In case the read transfer didn't finish quickly enough, the loop in the driver code would spin fast enough to write the same value into the cmd_data register again before re-checking whether the transfer completed, which would cause another spurious read transfer on the bus. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefan Roese <sr@denx.de> Cc: Alexey Brodkin <abrodkin@synopsys.com> Cc: Heiko Schocher <hs@denx.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Chin Liang See <clsee@altera.com>
* travis-ci: Add test.py for various qemu platformsTom Rini2016-10-24-1/+35
| | | | | | | | | | - Add a PPA for a more recent qemu (required for PowerPC to work) - Add tests to run test.py for various QEMU platforms. This relies on swarren's uboot-test-hooks repository to provide the abstractions. Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
* travis-ci: Drop 'TEST_CMD'Tom Rini2016-10-24-16/+10
| | | | | | | | | | | We don't need to use TEST_CMD in order to run tests. We need a BUILDMAN and TOOLCHAIN variable to avoid having to duplicate logic or write some wrapper function. But this makes the tests harder as we add more complex examples. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* travis-ci: Add more architecturesTom Rini2016-10-24-0/+9
| | | | | | | | We can now build for microblaze, sh4 and xtensa. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* travis-ci: Update toolchain and buildman usageTom Rini2016-10-24-44/+15
| | | | | | | | | | | - Drop the 'cache' line, travis-ci says to not cache apt packages (and does not). - Get the Ubuntu provided toolchain for ARM and PowerPC. - Add more toolchain options that buildman can fetch. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* travis-ci: Do not make buildman warnings fatalTom Rini2016-10-24-0/+7
| | | | | | | | | | | We currently will always see a number of warnings due to device tree issues. These (and other warnings) should not make the build be marked as failure so catch exit status 129 specifically and return 0 in that case. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* travis-ci: Use a git URI for dtc.gitTom Rini2016-10-24-1/+1
| | | | | | | | | | Currently we fail to fetch the dtc.git tree due to an SSL issue within the travis-ci environment. The easiest fix here is to switch to a git URI. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* travis-ci: Switch to Ubuntu 14.04 'Trusty Tahr'Tom Rini2016-10-24-1/+2
| | | | | | | | | In order to make other various improvements, update to the latest environment travis-ci supports. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Heiko Schocher <hs@denx.de>
* api: storage: Avoid enumeration for non-configured subsystemEmmanuel Vadot2016-10-24-1/+5
| | | | | | If a subsystem wasn't configured, avoid enumeration. Signed-off-by: Emmanuel Vadot <manu@bidouilliste.com>
* tools: moveconfig: support wildcards in --defconfigs fileMasahiro Yamada2016-10-24-8/+22
| | | | | | | | | | | Supporting shell-style wildcards for the --defconfigs option will be useful to run the moveconfig tool against a specific platform. For example, "uniphier*" in the file passed by --defconfigs option will be expanded to defconfig files that start with "uniphier". This is easier than listing out all defconfig files you are interested in. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
* Fix codying style broken by recent libfdt syncMasahiro Yamada2016-10-24-9/+9
| | | | | | | | | Commit b02e4044ff8e ("libfdt: Bring in upstream stringlist functions") broke codying style in some places especially by inserting an extra whitespace before fdt_stringlist_count(). Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by: Simon Glass <sjg@chromium.org>
* libfdt: fix fdt_stringlist_search()Masahiro Yamada2016-10-24-1/+1
| | | | | | | | | If fdt_getprop() fails, negative error code should be returned. [ DTC commit: daa75e8fa5942caa8e97931aed3a1ee0b7edd74b ] Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
* libfdt: fix fdt_stringlist_count()Masahiro Yamada2016-10-24-1/+1
| | | | | | | | | If fdt_getprop() fails, negative error code should be returned. [ DTC commit: e28eff5b787adb3f461d1653598818b2f1f25a73 ] Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
* power: twl6030: fix code refactoringNicolae Rosia2016-10-24-2/+2
| | | | | | | | | Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code but the register read ended up in the wrong if branch. Currently, the else branch checks a variable which is always 0. Signed-off-by: Nicolae Rosia <nicolae_rosia@mentor.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* ext4: Only write journal entries for modified blocks in unlink_filenameStefan Brüns2016-10-24-10/+13
| | | | | | | | | Instead of creating a journal entry for each directory block, even if the block is unmodified, only log the modified block. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
* ext4: Fix handling of direntlen in unlink_filenameStefan Brüns2016-10-24-28/+17
| | | | | | | | | | | | | | | | The direntlen checks were quite bogus, i.e. the loop termination used "len + offset == blocksize" (exact match only), and checked for a direntlen less than 0. The latter can never happen as the len is unsigned, this has been reported by Coverity, CID 153384. Use the same code as in search_dir for directory traversal. This code has the correct checks for direntlen >= sizeof(struct dirent), and offset < blocksize. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reported-by: Coverity (CID: 153383, 153384) Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
* ext4: cleanup unlink_filename functionStefan Brüns2016-10-24-14/+15
| | | | | | | | Use the same variable names as in search_dir, to make purpose of variables more obvious. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Tom Rini <trini@konsulko.com>
* Merge git://git.denx.de/u-boot-fdtTom Rini2016-10-24-79/+147
|\
| * libfdt: Sync overlay with upstreamMaxime Ripard2016-10-23-79/+147
| | | | | | | | | | | | | | | | | | Now that the overlay code has been merge upstream, update our copy to what's been merged, since a significant number of issues have been fixed during the merge process. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Simon Glass <sjg@chromium.org>
* | Convert CONFIG_SYS_STDIO_DEREGISTER to KconfigSimon Glass2016-10-23-27/+57
| | | | | | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_STDIO_DEREGISTER This option should never be enabled in SPL, so use CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER) when checking the option. Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Re-sync] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_USB_KEYBOARD to KconfigSimon Glass2016-10-23-20/+52
| | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_USB_KEYBOARD Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Fixup MPC86* configs] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_SYS_CONSOLE_INFO_QUIET to KconfigSimon Glass2016-10-23-84/+203
| | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_INFO_QUIET Signed-off-by: Simon Glass <sjg@chromium.org> [trini: Make this default n, re-run the migration] Signed-off-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE to KconfigSimon Glass2016-10-23-34/+53
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_SYS_CONSOLE_ENV_OVERWRITE to KconfigSimon Glass2016-10-23-21/+18
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_ENV_OVERWRITE Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_CONSOLE_SCROLL_LINES to KconfigSimon Glass2016-10-23-30/+37
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CONSOLE_SCROLL_LINES Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | video: Drop CONFIG_CONSOLE_INFO_QUIETSimon Glass2016-10-23-6/+0
| | | | | | | | | | | | | | This is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | video: Move video_get_info_str() prototype to a header fileSimon Glass2016-10-23-17/+23
| | | | | | | | | | | | | | | | This should be defined in a header file so that arguments are checked. Move it to video.h. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_CONSOLE_EXTRA_INFO to KconfigSimon Glass2016-10-23-8/+23
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CONSOLE_EXTRA_INFO Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_VIDEO_SW_CURSOR to KconfigSimon Glass2016-10-23-38/+64
| | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_VIDEO_SW_CURSOR Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> [trini: Re-convert, find all the cases where this is off] Signed-off-by: Tom Rini <trini@konsulko.com>
* | video: Drop CONFIG_VIDEO_HW_CURSORSimon Glass2016-10-23-116/+1
| | | | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_VGA_AS_SINGLE_DEVICE to KconfigSimon Glass2016-10-23-69/+28
| | | | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_VGA_AS_SINGLE_DEVICE Once we migrate to driver model for video, we should be able to drop this option. Signed-off-by: Simon Glass <sjg@chromium.org>
* | video: Drop the sed13806 driverSimon Glass2016-10-23-383/+0
| | | | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | video: Drop the s3c-fb driverSimon Glass2016-10-23-174/+1
| | | | | | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Minkyu Kang <mk7.kang@samsung.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | video: Drop the imx25lcdc driverSimon Glass2016-10-23-122/+0
| | | | | | | | | | | | | | This is not used anywhere in U-Boot. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | video: Drop the smiLynxEM driverSimon Glass2016-10-23-856/+0
| | | | | | | | | | | | | | This is not used in U-Boot anymore. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_SYS_CONSOLE_BG_COL et al to KconfigSimon Glass2016-10-23-68/+78
| | | | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_CONSOLE_BG_COL CONFIG_SYS_CONSOLE_FG_COL Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_VIDEO_CT69000 to KconfigSimon Glass2016-10-23-26/+30
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_VIDEO_CT69000 Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_CFB_CONSOLE_ANSI to KconfigSimon Glass2016-10-23-8/+21
| | | | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CFB_CONSOLE_ANSI Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
* | Convert CONFIG_CFB_CONSOLE to KconfigSimon Glass2016-10-23-99/+43
| | | | | | | | | | | | | | This converts the following to Kconfig: CONFIG_CFB_CONSOLE Signed-off-by: Simon Glass <sjg@chromium.org>
* | config: Drop CONFIG_CONSOLE_DEVSimon Glass2016-10-23-27/+26
| | | | | | | | | | | | | | | | This is not really a config. Rename it to avoid confusion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* | config: Drop CONFIG_CONSOLESimon Glass2016-10-23-4/+3
| | | | | | | | | | | | | | | | This is not really a config. Rename it to avoid confusion. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: Jagan Teki <jteki@openedev.com>