summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* i2c: sandbox: remove code snippet from Kconfig helpMasahiro Yamada2017-02-13-22/+1
| | | | | | | | | | | | | | | With the Kconfig re-sync with Linux 4.10, characters such as '}', ';' in Kconfig help message cause warnings: $ make defconfig *** Default configuration is based on 'sandbox_defconfig' drivers/i2c/Kconfig:132:warning: ignoring unsupported character '}' drivers/i2c/Kconfig:132:warning: ignoring unsupported character ';' Drop the Device Tree fragment from the help. Acked-by: Heiko Schocher <hs@denx.de> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* kconfig: re-sync with Linux 4.10Masahiro Yamada2017-02-12-1639/+1930
| | | | | | | | | | | | | | | Re-sync all files under the scripts/kconfig directory with Linux 4.10. Some parts include U-Boot own modification. I made sure to not revert the following commits: 5b8031ccb4ed ("Add more SPDX-License-Identifier tags") 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.") da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags") 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* flash: compile common/flash.c iif CONFIG_MTD_NO_FLASH is enabledMasahiro Yamada2017-02-12-6/+1
| | | | | | | The whole of common/flash.c is guarded by #if defined() ... #endif. Move the conditional to common/Makefile. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* flash: complete CONFIG_SYS_NO_FLASH move with renamingMasahiro Yamada2017-02-12-589/+751
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is not completed. Finish this work by the tool. During this move, let's rename it to CONFIG_MTD_NOR_FLASH. Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH" than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will make the code more readable. Besides, negative meaning symbols do not fit in obj-$(CONFIG_...) style Makefiles. This commit was created as follows: [1] Edit "default n" to "default y" in the config entry in common/Kconfig. [2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH" [3] Rename the instances in defconfigs by the following: find . -path './configs/*_defconfig' | xargs sed -i \ -e '/CONFIG_SYS_NO_FLASH=y/d' \ -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/' [4] Change the conditionals by the following: find . -name '*.[ch]' | xargs sed -i \ -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \ -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \ -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \ -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/' [5] Modify the following manually - Rename the rest of instances - Remove the description from README - Create the new Kconfig entry in drivers/mtd/Kconfig - Remove the old Kconfig entry from common/Kconfig - Remove the garbage comments from include/configs/*.h Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* Merge git://git.denx.de/u-boot-samsungTom Rini2017-02-11-2/+1
|\
| * exynos: Drop large alignment for SDRAM parametersSimon Glass2017-02-10-2/+1
| | | | | | | | | | | | | | | | | | | | | | We don't ever search for these so there is no need for a 4KB alignment. It just wastes space. Drop this and use the standard 4-byte alignment. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
* | Merge git://git.denx.de/u-boot-rockchipTom Rini2017-02-11-170/+96
|\ \ | |/ |/|
| * rockchip: rename miniarm to tinker boardEddie Cai2017-02-09-23/+23
| | | | | | | | | | | | | | | | Miniarm is the internal project code. Now it is officially named Tinker board. So rename it. Signed-off-by: Eddie Cai <eddie.cai@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: Enable ETH address randomization for the firefly-rk3288Romain Perier2017-02-09-0/+1
| | | | | | | | | | | | | | | | | | This commit enables ethernet MAC address randomization on the firefly-rk3288. It removes the error at startup 'ethernet@ff290000 address not set'. Signed-off-by: Romain Perier <romain.perier@collabora.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: firefly: configs: use spl back to bromJacob Chen2017-02-09-6/+1
| | | | | | | | | | | | | | Keep it same with other boards otherwise i have to write special script for it.. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: configs: move env offset to common headerJacob Chen2017-02-09-84/+14
| | | | | | | | | | | | | | To reduce redundant code. Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * rockchip: Correct MAINTAINER entry for chromebook_minnieSimon Glass2017-02-09-2/+2
| | | | | | | | | | | | | | | | | | | | | | This is wrong at present, so genboardscfg.py gives the following warnings: WARNING: no status info for 'chromebook_minnie' WARNING: no maintainers for 'chromebook_minnie' Fix it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * rockchip: dts: rk3288: correct sdram setting for miniarmJacob Chen2017-02-09-8/+8
| | | | | | | | | | | | | | | | | | | | | | miniarm board use lpddr3 Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com> Acked-by: Simon Glass <sjg@chromium.org> Added 'rockchip:' prefix to subject: Signed-off-by: Simon Glass <sjg@chromium.org> Change-Id: I84c3679dab2dbd8d01c1ebfd22220946d07c03cd
* | Merge branch 'master' of git://git.denx.de/u-boot-videoTom Rini2017-02-09-1/+1
|\ \
| * | drivers/video/cfb_console.c: Correct "COFNIG_NDS32" typo.Robert P. J. Day2017-02-03-1/+1
| | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | | omap_hsmmc.c: Fix build warning on non-omap3Tom Rini2017-02-09-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was incorrect to always include "asm/arch-omap3/mux.h" constantly. This introduced warnings on non-omap3 where certain values will conflict between the various families. Conditionally guard the inclusion in order to correct the problem. Fixes: 6aca17c9b7e8 ("drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xx") Signed-off-by: Tom Rini <trini@konsulko.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2017-02-09-94/+872
|\ \ \
| * | | net: phy: MSCC Add Support for VSC8530-VSC8531-VSC8540-VSC8541John Haechten2017-02-08-0/+517
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Haechten <john.haechten@microsemi.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | drivers: net: Provide Kconfig menu for PHYLIBAlex2017-02-07-26/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the necessary Kconfig symbols so that PHYLIB support may be enabled in Kconfig, as opposed to needing to #define these symbols in C source headers. BITBANGMII and MV88E6352_SWITCH are left out of the PHYLIB submenu as they don't seem to explicitly depend on it (i.e. they do not use the phy_driver class). Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: Improve the Marvell 151x constantsJoe Hershberger2017-02-07-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use some constants for the phy configuration instead of so many magic numbers. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: fec_mxc: Fix corruption of device tree blobDaniel Strnad2017-02-07-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifying content of dev->name leads to the device tree corruption because it points to the node name located there. Signed-off-by: Daniel Strnad <strnadda@gmail.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Jagan Teki <jagan@amarulasolutions.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: designware: Fix for use with current Linux device tree for Meson GXHeiner Kallweit2017-02-07-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Uboot for Meson GX the compatible string in meson-gxbb.dtsi so far is: compatible = "amlogic,meson6-dwmac", "snps,dwmac"; On Linux in the same dt file it's compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac"; To avoid breaking ethernet with the next DT synch from Linux to U-Boot (planned as prerequisite for adding Meson GX MMC driver to U-Boot) add "amlogic,meson-gx-dwmac" to the compatibility list in the designware driver. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: dp83867: Add support for MAC impedance configurationMugunthan V N2017-02-07-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for programmable MAC impedance configuration and fix typo in DT impedance parameters names. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Tested-by: Lokesh Vutla <lokeshvutla@ti.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: vitesse: Fix cis8204 RGMII_ID codePhil Edworthy2017-02-07-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 79e86ccb3786c8b20004db3fa10a70049456f580 "vitesse: remove duplicated argument to ||" correctly removed a redundant check. However, I believe that the original code was simply wrong, and should have been checking against RGMII_ID. To fix this and avoid similar problems in the future, use the phy_interface_is_rgmii helper function. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: Marvell: Use phy_interface_is_rgmii helper functionPhil Edworthy2017-02-07-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Reviewed-by: Stefan Roese <sr@denx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: Add support for Marvell M88E1512Phil Edworthy2017-02-07-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This device also works with the 88E1518 code, so we just adjust the UID mask accordingly. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: Fix mask so that we can identify Marvell 88E1518Phil Edworthy2017-02-07-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mask for the 88E1510 meant that the 88E1518 code would never be used. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Reviewed-by: Stefan Roese <sr@denx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: phy: ti: Fix dp83867 RGMII_TXID interface pathPhil Edworthy2017-02-07-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is code that is specifically for RGMII_TXID interface, but this will never get used because the code checks that the RGMII interface is RGMII_ID to RGMII_RXID; RGMII_TXID is after this. To fix this and avoid similar problems in the future, use the phy_interface_is_rgmii helper function. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | tools: Add tool to add crc8 to a mac addressoliver@schinagl.nl2017-02-07-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a little tool that takes a generic MAC address and generates a CRC byte for it. The output is the full MAC address without any separators, ready written into an EEPROM. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | tools: Allow crc8 to be usedoliver@schinagl.nl2017-02-07-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables crc8 to be used from within the tools directory using u-boot/crc.h. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
| * | | net: core: cosmetic: A MAC address is not limited to SROMoliver@schinagl.nl2017-02-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we print that the MAC from the SROM does not match. It can be many forms of ROM, so lets drop the S. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: cosmetic: Define ethernet name lengtholiver@schinagl.nl2017-02-07-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are various places where the ethernet device name is defined to several different sizes. Lets add a define and start using it. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: cosmetic: Make the MAC address string less magicaloliver@schinagl.nl2017-02-07-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In u-boot printf has been extended with the %pM formatter to allow printing of MAC addresses. However buffers that want to store a MAC address cannot safely get the size. Add a define for this case so the string of a MAC address can be reliably obtained. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: cosmetic: Do not use magic values for ARP_HLENoliver@schinagl.nl2017-02-07-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 674bb249825a ("net: cosmetic: Replace magic numbers in arp.c with constants") introduced a nice define to replace the magic value 6 for the ethernet hardware address. Replace more hardcoded instances of 6 which really reference the ARP_HLEN (iow the MAC/Hardware/Ethernet address). Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: macb: Remove redundant #ifdef CONFIG_DM_ETHWenyou Yang2017-02-07-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the redundant #ifdef CONFIG_DM_ETH/#endif. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: macb: Add the clock supportWenyou Yang2017-02-07-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to introducing the at91 clock driver, add the clock support. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | | net: Kconfig: Add CONFIG_MACB optionWenyou Yang2017-02-07-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG_MACB option in KConfig to be used to select the Cadence MACB Ethernet driver. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-mmcTom Rini2017-02-09-47/+273
|\ \ \ \
| * | | | mmc: init mmc block devices on probeFiach Antaw2017-02-09-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MMC devices accessed exclusively via the driver model were not being initialized before being exposed as block devices, causing issues in scenarios where the MMC device is first accessed via the uclass block interface. Signed-off-by: Fiach Antaw <fiach.antaw@uqconnect.edu.au>
| * | | | drivers: mmc: omap_hsmmc: Fix IO Buffer on OMAP36xxAdam Ford2017-02-09-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the OMAP36xx/37xx the CONTROL_WKUP_CTRL register has a field (bit 6) named GPIO_IO_PWRDNZ. If 0, the IO buffers which are related to GPIO_126, 127 and 129 are disabled. Some boards may need this for MMC. After the PBIAS is configured, this bit should be set high to enable these GPIO pins. Signed-off-by: Adam Ford <aford173@gmail.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | | | mmc: ftsdc021_sdhci: remove the ftsdc021_sdhci.cJaehoon Chung2017-02-09-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ftsdc021_sdhci.c is dead file. There is no reason to maintain this host controller. Removes the entire ftsdc021_sdhci.c. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Tom Rini <trini@konsulko.com>
| * | | | mmc: mmc-uclass: use the fixed devnum with alias nodeJaehoon Chung2017-02-09-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are alias nodes as "mmc", use the devnum as alias index number. This patch is for fixing a problem of Exynos4 series. Problem is the below thing. Current legacy mode: EXYNOS DWMMC: 0, SAMSUNG SDHCI: 1 After using DM: SAMSUNG SDHCI: 0, EXYNOS DWMMC: 1 Dev index is swapped. Then u-boot can't find the kernel image..because it is already set to 0 as mmcdev. If change from legacy to DM, also needs to touch all exynos4 config file. For using simply, just supporting the fixed devnum with alias node is better than it. Usage: alaise { .... mmc0 = &sdhci2; /* eMMC */ mmc1 = &sdhci1; /* SD */ ... } Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | | | arm: dts: trats: add the pmic node for using DMJaehoon Chung2017-02-09-8/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use driver-model adds the pmic node for max8997. This is used as kernel device-tree in Linux. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org>
| * | | | power: pmic: add the max8997 controller for DMJaehoon Chung2017-02-09-1/+78
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the max8997 controller for Driver model. Exynos4210 is using max8997 pmic controller. (pmic_max8997.c should be deprecated.) Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | | omap3_logic: Switch to simple malloco in SPLTom Rini2017-02-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | To save more space, switch to simple malloc here. Signed-off-by: Tom Rini <trini@konsulko.com>
* | | | qemu-x86_64_defconfig: Disable CONFIG_BOARD_EARLY_INIT_FTom Rini2017-02-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The qemu-x86* targets do not want to enable this. Signed-off-by: Tom Rini <trini@konsulko.com>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini2017-02-08-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | arm: socfpga: set the mpuclk divider in the Altera group registerDinh Nguyen2017-02-08-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mpuclk register in the Altera group of the clock manager divides the mpu_clk that is generated from the C0 output of the main pll. Without this patch, the default value of the register is 1, so the mpuclk will always get divided by 2 if the correct value is not set. For example, on the Arria5 socdk board, the MPU clock is only 525 MHz, and it should be 1.05 GHz. Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
* | | Merge git://git.denx.de/u-boot-dmTom Rini2017-02-08-440/+576
|\ \ \
| * | | patman: Handle non-ascii characters in namesChris Packham2017-02-08-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When gathering addresses for the Cc list patman would encounter a UnicodeDecodeError due to non-ascii characters in the author name. Address this by explicitly using utf-8 when building the Cc list. Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
generated by cgit v1.1 at 2024-11-09 15:38:28 +0000