summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-16Merge git://git.denx.de/u-boot-mpc85xxTom Rini
2017-05-16Merge branch 'master' of git://git.denx.de/u-boot-mmcTom Rini
- Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to match other TI platforms in the same situation. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-16Merge branch 'master' of git://git.denx.de/u-boot-videoTom Rini
2017-05-15mmc: atmel_sdhci: Enable the quirk SDHCI_QUIRK_WAIT_SEND_CMDWenyou Yang
To fix the timeout of sending the write command, enable the quirk SDHCI_QUIRK_WAIT_SEND_CMD. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15sunxi: Add clock support for TV encoderJernej Skrabec
This patch adds support for TV encoder clocks which will be used later. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
2017-05-15sunxi: video: Split out TVE codeJernej Skrabec
Newer SoCs use same TV encoder unit. Split it out so it can be reused with new DM video driver. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPPPhilipp Tomsich
Due to a typo, the 24 bit-per-pixel configuration ends in 24BMP instead of 24BPP. This change renames it throughout the source tree for consistency and to make moving these options into Kconfig easier and less error-prone. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
2017-05-15rockchip: video: introduce VIDEO_DW_HDMI and select for Rockchip HDMIPhilipp Tomsich
Instead of having drivers/video/rockchip/Kconfig point outside of its hierarchy for dw_hdmi.o, we should use a configuration-option to include the Designware HDMI support. This change introduces a new config option (not to be selected via menuconfig, but to be selected from a dependent video driver's configuration option) that enables dw_hdmi.o and selects it whenever the HDMI support for Rockchip SoCs is selected. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15video: dw_hdmi: Select HDMI mode only if monitor supports itJernej Skrabec
Some DVI monitors don't work in HDMI mode. Set it only if edid data explicitly states that it is supported. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15edid: Add HDMI flag to timing infoJernej Skrabec
Some DVI monitors don't show anything in HDMI mode since audio stream confuses them. To solve this situation, this commit adds HDMI flag in timing data and sets it accordingly during edid parsing. First existence of extension block is checked. If it exists and it is CEA861 extension, then data blocks are checked for presence of HDMI vendor specific data block. If it is present, HDMI flag is set. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15edid: Set timings flags according to edidJernej Skrabec
Timing flags are never set, so they may contain garbage. Since some drivers check them, video output may be broken on those drivers. Initialize them to 0 and check for few common flags. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini
2017-05-15kbuild: update DTC warning settings for bus and node/property name checksMasahiro Yamada
Recent commits of DTC introduced new warnings checking PCI and simple buses, unit address formatting, and stricter node and property name checking. Disable the new DTC warnings by default. As before, warnings are enabled with W=*. The strict node and property name checks are a bit subjective, so they are only enabled for W=2. (This policy reflects the commit 8654cb8d0371 of Linux.) Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15omap3: omap3_logic: switch to using TI_COMMON_CMD_OPTIONAdam Ford
Enable TI_COMMON_CMD_OPTIONS and remove similar options from the defconfig. Updated with savedefconfig CMD_USB isn't enabled yet. I have some testing to do with musb. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-05-15power: twl4030: Add imply CMD_POWEROFF when TWL4030 is enabledAdam Ford
Now that CMD_POWEROFF can turn off the twl4030, let's imply that just incase someone wants to disable it. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-05-15Kconfig: OMAP: USB: Migrate CONFIG_USB_EHCI_OMAP to KconfigTom Rini
Follow the exiting logic for the i.MX options when migrating this option. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
2017-05-15Kconfig: USB: Migrate existing USB_EHCI_xxx optionsTom Rini
The following options are migrated over fully now: - USB_EHCI_ATMEL - USB_EHCI_MARVELL - USB_EHCI_MX6 - USB_EHCI_MX7 - USB_EHCI_MSM - USB_EHCI_ZYNQ - USB_EHCI_GENERIC This also requires fixing the depends on USB_EHCI_MARVELL as it's used by Orion5X and Kirkwood as well. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
2017-05-15Kconfig: USB: Migrate CONFIG_USB_EHCI_HCD users to KconfigTom Rini
Migrate the rest of the users of CONFIG_USB_EHCI_HCD over to Kconfig. For a few SoCs, imply or default y this if USB is enabled. In some cases we had not already migrated to CONFIG_USB so do that as well. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
2017-05-15powerpc: t1024: Fix SRDS_MAX_LANES valuePaulo Zaneti
T1023 and T1024 have 4 SerDes lanes. Fix macro SRDS_MAX_LANES and use this macro instead of hard-coded value in t1024_serdes.c. Signed-off-by: Paulo Zaneti <paulo.zaneti@datacom.ind.br> Signed-off-by: York Sun <york.sun@nxp.com>
2017-05-15Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCDTom Rini
In order to be able to migrate the various SoC EHCI CONFIG options we first need to finish the switch from CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
2017-05-15whitelist: Drop more unused OMAP symbolsTom Rini
The symbol CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID was recently dropped from usage and CONFIG_OMAP3_MICRON_DDR is unused in code. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap: Drop CONFIG_OMAP_VC_I2C_HS_MCODETom Rini
The symbol CONFIG_OMAP_VC_I2C_HS_MCODE always uses the default value. Restructure the comment and code such that if a need arises later to use another value we can address this then. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15watchdog: Migrate OMAP_WATCHDOG to KconfigTom Rini
Move this entry to Kconfig. As it is a hardware watchdog, select HW_WATCHDOG. While we could default to enabling this for all platforms, it is currently only enabled by default on AM33XX, so keep that logic today. Cc: Roger Meier <r.meier@siemens.com> Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap: spi: Drop CONFIG_OMAP3_SPI_D0_D1_SWAPPED supportTom Rini
This particular quirk is not enabled in any config files today. It does however exist and is handled correctly in device trees and via CONFIG_DM_SPI. So we drop the symbol now and add a comment to indicate that any (new) boards that require this quirk need to enable DM_SPI instead. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap3: Migrate CONFIG_OMAP3_GPIO_X to KconfigTom Rini
The symbols CONFIG_OMAP3_GPIO_X control if we enable the clocks for a given GPIO bank in U-Boot. select the required banks for each target. In some cases we need to also migrate from CONFIG_USB_EHCI (deprecated, in include/configs/) to CONFIG_USB_EHCI_HCD as we only require the GPIO bank to be enabled if USB is also enabled. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15gpio: Move OMAP_GPIO to KconfigTom Rini
This driver is used often enough such that we want to have this enabled by default on any ARCH_OMAP2PLUS board, and this only compiles on ARCH_OMAP2PLUS due to required defines, so mark that as the depends. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap3: Drop unused CONFIG_OMAP3_xxx board definesTom Rini
We no longer have a need for a per-board CONFIG_OMAP3_xxx define (we have CONFIG_TARGET_xxx when this is required), so drop these unused references. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap4: Drop redundant CONFIG_OMAP4430 symbolTom Rini
While there are a few different OMAP4 SoCs, today we always set CONFIG_OMAP4430 and CONFIG_OMAP44XX. Convert the few test of CONFIG_OMAP4430 to CONFIG_OMAP44XX. Cc: Marek Vasut <marex@denx.de> Cc: Paul Kocialkowski <contact@paulk.fr> Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when neededTom Rini
We make use of CONFIG_OMAP3_EVM today to know when to do a specific tweak in MUSB. This can be tested on via CONFIG_TARGET_OMAP3_EVM instead, so switch there so we can drop the now unused symbol CONFIG_OMAP3_EVM. In investigating what to do about the symbol usage we see that the cairo board defines the same function, but never called it (as it does not define CONFIG_OMAP3_EVM) and was just returning anyhow, so drop that function from that board. Cc: "Albert ARIBAUD (3ADEV)" <albert.aribaud@3adev.fr> Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap5: Migrate CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC to KconfigTom Rini
While in theory this value could be used in places outside of "omap5" (such as OMAP4), we only make use of it today in OMAP5, so place the Kconfig entry there. Given that Kconfig lets us provide a default, we drop CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC entirely. The contents of doc/README.omap-reset-time make a good help entry, so adjust them slightly and delete the file. Move the comment about range to where we use the value now, and have Kconfig enforce the upper bound. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15TI: Drop 'CONFIG_OMAP'Tom Rini
In the two cases in the code where we use CONFIG_OMAP as a useful test currently we can make use of CONFIG_ARCH_OMAP2PLUS instead. With that changed we can drop all defines of CONFIG_OMAP. While in here, CONFIG_OMAP3430 is only defined and then never used, so drop. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15omap24xx_i2c.c: Drop references to CONFIG_OMAP243XTom Rini
We have nothing defining CONFIG_OMAP243X since we dropped the omap243x platforms, drop these tests. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Heiko Schocher <hs@denx.de>
2017-05-15arch/arm/cpu/arm926ejs/omap: RemoveTom Rini
This code has been unused since the removal of the "omap2" platforms, remove. Signed-off-by: Tom Rini <trini@konsulko.com>
2017-05-15davinci: omapl138_lcdk: drop custom prompt stringSekhar Nori
Drop custom command prompt string in favor of default used by U-Boot. This helps in easier automation setup across boards. Signed-off-by: Sekhar Nori <nsekhar@ti.com>
2017-05-15board_f: skip timer_init() on Coldfire archsAngelo Dureghello
Coldfire arch is not happy with timer_init since interrupt handlers are still not set at that stage, and the boot hangs silently. Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2017-05-15spl: add support to booting with ATFKever Yang
ATF(ARM Trusted Firmware) is used by ARM arch64 SoCs, find more infomation about ATF at: https://github.com/ARM-software/arm-trusted-firmware SPL is considered as BL2 in ATF terminology, it needs to load other parts of ATF binary like BL31, BL32, SCP-BL30, and BL33(U-Boot). And needs to prepare the parameter for BL31 which including entry and image information for all other images. Then the SPL handle PC to BL31 with the parameter, the BL31 will do the rest of work and at last get into U-Boot(BL33). This patch needs work with patches from Andre for SPL support multi binary in FIT. The entry point of bl31 and bl33 are still using hard code because we still can not get them from the FIT image information. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Acked-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
2017-05-15armv8: minor fix to comment for enabling SMPEN bitDinh Nguyen
The SMPEN bit is located in the cpuectlr_el1 register and not the cpuactlr_el1 register. Adjust the comment accordingly and also fix a spelling error. Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> CC: Mingkai Hu <mingkai.hu@nxp.com> CC: Gong Qianyu <Qianyu.Gong@nxp.com> CC: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> CC: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> CC: York Sun <york.sun@nxp.com> CC: Albert Aribaud <albert.u.boot@aribaud.net> CC: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: York Sun <york.sun@nxp.com>
2017-05-15mmc: descend into drivers/mmc only when CONFIG_MMC is enabledMasahiro Yamada
This simplifies makefiles. Also, arrange the order of objects in drivers/mmc/Makefile so that the framework objects are listed before drivers. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMCMasahiro Yamada
Now CONFIG_GENERIC_MMC and CONFIG_MMC match for all defconfig. We do not need two options for the same feature. Deprecate the former. This commit was generated with the sed script 's/GENERIC_MMC/MMC/' and manual fixup of drivers/mmc/Kconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15blanche_defconfig: enable CONFIG_MMCMasahiro Yamada
As commit 54925327fa11 ("mmc: move CONFIG_GENERIC_MMC to Kconfig") addressed, this is one of the last weird defconfigs that define CONFIG_GENERIC_MMC without CONFIG_MMC. Now I took a closer look at this. Given that both CONFIG_CMD_MMC and CONFIG_GENERIC_MMC are set for this defconfig, CONFIG_MMC should be enabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15sandbox_noblk_defconfig: disable CONFIG_GENERIC_MMCMasahiro Yamada
As commit 54925327fa11 ("mmc: move CONFIG_GENERIC_MMC to Kconfig") addressed, this is one of the last weird defconfigs that define CONFIG_GENERIC_MMC without CONFIG_MMC. Now I took a closer look at this. Given that neither CONFIG_CMD_MMC nor CONFIG_MMC is set for this defconfig, CONFIG_GENERIC_MMC should be disabled. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15mmc: sdhci-cadence: import updates from Linux 4.12Masahiro Yamada
This driver is a counterpart of drivers/mmc/host/sdhci-cadence.c from Linux. Some updates for v4.12-rc1 can be imported to U-Boot. - Fix value of SDHCI_CDNS_HRS04_RDATA_SHIFT - Add polling for ACK bit to be sure that data are written to the PHY register - Retrieve PHY values from DT properties instead of fixed data The following is the list of upstream commits: - Linux commit 4e03f628b464e0580abadf5161eaa38c61d20943 mmc: sdhci-cadence: fix bit shift of read data from PHY port - Linux commit a0f8243229ed071c8da0ea7cedc1b7bf1b1515da mmc: sdhci-cadence: Fix writing PHY delay - Linux commit a89c472d8b55c5afc4c79e6e3d1338730034eb01 mmc: sdhci-cadence: Update PHY delay configuration Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
2017-05-15mmc: sdhci: Fix maximum clock for programmable clock modeWenyou Yang
In the programmable clock mode, the SDCLK frequency is incorrectly assigned when the maximum clock has been assigned during probe, this causes the SDHCI not work well. In the programmable clock mode, when calculating the SDCLK Frequency Select, when the maximum clock has been assigned, it is the actual value, should not be multiplied by host->clk_mul. Otherwise, the maximum clock is multiplied host->clk_mul by the base clock achieved from the BASECLKF field of the Capabilities 0 Register. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
2017-05-15drivers: omap_hsmmc: move to DM_MMC_OPSJean-Jacques Hiblot
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15include: config: am335x: disable DM_MMC_OPS if DM_MMC is disabledJean-Jacques Hiblot
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2017-05-15Drop use of CONFIG_I2C_SOFTSimon Glass
This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-05-15Drop CONFIG_I2CFASTSimon Glass
This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-05-15i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INITSimon Glass
This option is not used by any boards. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-05-15i2c: README: Drop CONFIG_SYS_I2C_INIT_MPC5XXXSimon Glass
This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
2017-05-15i2c: Finish dropping use of CONFIG_I2C_HARDSimon Glass
Drop use of this long-deprecated option. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>