summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* net: mvpp2x: Enable GoP packet padding in TXStefan Chulski2017-08-101-12/+0
| | | | | | | | | | | This patch enables padding of packets shorter than 64B in TX(set by default). Disabling of padding causes crashes on MACCIATO board. Signed-off-by: Stefan Chulski <stefanc@marvell.com> Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Igal Liberman <igall@marvell.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Stefan Roese <sr@denx.de>
* net: mvpp2x: fix phy connected to wrong mdio issueStefan Chulski2017-08-101-1/+25
| | | | | | | | | | | | | | | | | | | | A8K marvell SoC has two South Bridge communication controllers(CP0 and CP1). Each communication controller has packet processor ports and MDIO. On MACHIATOBin board ports from CP1 are connected to mdio on CP0. Issue: Wrong base address is assigned to MDIO interface during probe. Fix: Get MDIO address from PHY handler parent base address. This should be refined in the future when MDIO driver is implemented. Signed-off-by: Stefan Chulski <stefanc@marvell.com> Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Igal Liberman <igall@marvell.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Stefan Roese <sr@denx.de>
* net: mvpp2x: Add GPIO configuration supportStefan Chulski2017-08-101-0/+31
| | | | | | | | | | | | | This patch add GPIO configuration support in mvpp2x driver. Driver will handle 10G SFP gpio reset and SFP TX disable. GPIO pins should be set in device tree. Signed-off-by: Stefan Chulski <stefanc@marvell.com> Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Kostya Porotchkin <kostap@marvell.com> Reviewed-by: Igal Liberman <igall@marvell.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Stefan Roese <sr@denx.de>
* Merge git://git.denx.de/u-boot-x86Tom Rini2017-08-0816-87/+380
|\
| * x86: Add defconfig for theadorable-x86-conga with PCIe x4 blobsStefan Roese2017-08-082-0/+56
| | | | | | | | | | | | | | | | | | This defconfig uses the PCIe x4 binary blobs from the congatec BIOS. 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>
| * x86: conga: theadorable-x86-conga-qa3-e3845_defconfig: Misc defconfig updatesStefan Roese2017-08-081-3/+3
| | | | | | | | | | | | | | | | | | | | - Disable debug UART - Enable more partition support 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>
| * x86: conga: conga-qeval20-qa3-e3845_defconfig: Misc defconfig updatesStefan Roese2017-08-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Enable ACPI resume support - Disable debug UART - Enable Spansion and Winbond SPI flash support - Move VGA BIOS binary address to enable bigger U-Boot images 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>
| * x86: theadorable-x86: Add header file for common defines and envStefan Roese2017-08-083-46/+179
| | | | | | | | | | | | | | | | | | | | | | This patch adds the common header include file theadorable-x86-common.h for the theadorable-x86 targets to define all common options and the default environment. 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>
| * x86: conga: Add option to select different config headers for baseboardsStefan Roese2017-08-085-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-conga-qa3-e3845 is also added. Also the new defconfig file for this new target is added. 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>
| * x86: dfi: Add option to select different config headers for baseboardsStefan Roese2017-08-086-13/+71
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds the infrastructure to define different config headers with different configurations and default environment for the baseboards that can now be selected via Kconfig. The new configuration for the theadorable-x86-dfi-bt700 is also added. 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>
| * x86: acpi: Fix build error with certain configurationBin Meng2017-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CONFIG_EFI_PARTITION is not set, the following build error is seen in arch/x86/lib/acpi_s3.c: error: expected declaration specifiers or '...' before '*' token static void asmlinkage (*acpi_do_wakeup)(void *vector) = (void*)WAKEUP_BASE; This is actually caused by missing asmlinkage declaration, but with CONFIG_EFI_PARTITION on, the declaration comes from part.h which is included from common.h. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Stefan Roese <sr@denx.de>
| * x86: Remove dead ISA related codesBin Meng2017-08-081-66/+8
| | | | | | | | | | | | | | | | Neither new design uses ISA bus, nor does any U-Boot codes use these codes. Remove them. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | Merge git://www.denx.de/git/u-boot-cfi-flashTom Rini2017-08-081-2/+0
|\ \
| * | mtd: cfi: Zap CFI_FLASH_SHIFT_WIDTH redefinitionMarek Vasut2017-08-081-2/+0
| |/ | | | | | | | | | | | | | | | | This is defined twice in the same file, with the same value, likely because of some patch merge issue. Pick the uglier one and nuke it. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Stefan Roese <sr@denx.de>
* | Merge git://www.denx.de/git/u-boot-marvellTom Rini2017-08-081-3/+8
|\ \
| * | mvebu: turris_omnia: Fix PEX vs SATA detection for board topologyMarek BehĂșn2017-08-081-3/+8
| |/ | | | | | | | | | | | | | | The I2C reading in the PEX vs SATA detection code often fails on the first try. Try three times, as the code for EEPROM reading does. Signed-off-by: Marek Behun <marek.behun@nic.cz> Signed-off-by: Stefan Roese <sr@denx.de>
* | configs: Finish migration of PHY_GIGETom Rini2017-08-08427-98/+350
| | | | | | | | | | Reviewed-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@konsulko.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2017-08-07665-553/+1120
|\ \
| * | Move PHY_MICREL and PHY_MICREL_KSZ90X1 to KconfigAlexandru Gagniuc2017-08-07122-98/+109
| | | | | | | | | | | | | | | Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | Move PHYLIB to KconfigAlexandru Gagniuc2017-08-07603-105/+503
| | | | | | | | | | | | | | | Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: micrel: add an option to disable gigabit for the KSZ9031Sebastien Bourdelin2017-08-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | The environment variable "disable_giga" can now be used to disable 1000baseTx on the Micrel's KSZ9031. Signed-off-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: Use packed structures for networkingDenis Pynkin2017-08-075-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PXE boot is broken with GCC 7.1 due option '-fstore-merging' enabled by default for '-O2': BOOTP broadcast 1 data abort pc : [<8ff8bb30>] lr : [<00004f1f>] reloc pc : [<17832b30>] lr : [<878abf1f>] sp : 8f558bc0 ip : 00000000 fp : 8ffef5a4 r10: 8ffed248 r9 : 8f558ee0 r8 : 8ffef594 r7 : 0000000e r6 : 8ffed700 r5 : 00000000 r4 : 8ffed74e r3 : 00060101 r2 : 8ffed230 r1 : 8ffed706 r0 : 00000ddd Flags: nzcv IRQs off FIQs off Mode SVC_32 Resetting CPU ... Core reason is usage of structures for network headers without packed attribute. Reviewed-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com> Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: Fix compile failure in net.cHolger Dengler2017-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | Add missing "defined" statement to fix the compile failures. Signed-off-by: Holger Dengler <dengler@linutronix.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: Add AFE settings to the Broadcom Cygnus phyArun Parameswaran2017-08-071-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added the AFE (Analog Front End) settings for stability to the Broadcom Cygnus phy. This improves the time take to perform auto negotiation. Signed-off-by: Arun Parameswaran <arun.parameswaran@broadcom.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: move Broadcom SF2 driver to KconfigSuji Velupillai2017-08-076-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move to Kconfig: CONFIG_BCM_SF2_ETH CONFIG_BCM_SF2_ETH_DEFAULT_PORT CONFIG_BCM_SF2_ETH_GMAC Also modified defconfigs of all platforms that use these configs. Signed-off-by: Suji Velupillai <suji.velupillai@broadcom.com> Tested-by: Suji Velupillai <suji.velupillai@broadcom.com> Reviewed-by: JD Zheng <jiandong.zheng@broadcom.com> Reviewed-by: Scott Branden <scott.branden@broadcom.com> Signed-off-by: Steve Rae <steve.rae@raedomain.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: Hide Micrel KSZ9021 and KSZ9031 Kconfig optionsAlexandru Gagniuc2017-08-071-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The correct option is PHY_MICREL_KSZ90X1, but some configs still select the 9021 and 9031 options, which are deprecated. Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: micrel: Remove ksz90x1 drivers from micrel_ksz8xxxAlexandru Gagniuc2017-08-071-357/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | There should be no longer be any ksz9000 users that pick up the PHY driver from ksz8xxx, so remove ksz9000 remnants from there. Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | configs: Replace deprecated Micrel defines with PHY_MICREL_KSZ90X1Alexandru Gagniuc2017-08-0728-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | These boards will now use the ksz90x1 driver instead of the mess in ksz8xxx. This change is needed before the two drivers can be fully separated. Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: micrel: Separate KSZ9000 drivers from KSZ8000 driversAlexandru Gagniuc2017-08-076-8/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KS8721BL and KSZ9021 PHYs are software-incompatible, yet they share the same ID. Drivers for bothe PHYs cannot safely coexist, so the solution was to use #ifdefs to select between the two drivers. As a result KSZ9031, which has a unique ID, is now caught in the crossfire. Unless CONFIG_PHY_MICREL_KSZ9031 is defined, the KSZ9031 will not function properly, as some essential configuration code is ifdef'd-out. To prevent such situations, move the KSZ9000 drivers to a separate file, and place them under a separate Kconfig option. While it is possible to enable both KSZ8000 and KSZ9000 drivers at the same time, the assumption is that it is highly unlikely for a system to contain both a KSZ8000 and a KSZ9000 PHY, and that only one of the drivers will be enabled at any given time. Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: phy: Remove duplicate Kconfig selection for Micrel KSZ9021Alexandru Gagniuc2017-08-071-8/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Alexandru Gagniuc <alex.g@adaptrum.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: tftp: silence a subscript above array bounds compile time warningVladimir Zapolskiy2017-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For strncpy() select a minimal string length of destination and source strings, here DEFAULT_NAME_LEN is preferable to MAX_LEN. Due to the NUL-terminated contents of default_string the change is a noop, however it removes a compilation warning if SH2/3/4 platform specific strncpy() function is used: In file included from include/linux/string.h:21:0, from include/common.h:28, from net/tftp.c:9: net/tftp.c: In function 'tftp_start': arch/sh/include/asm/string.h:52:42: warning: array subscript is above array bounds [-Warray-bounds] : "0" (__dest), "1" (__src), "r" (__src+__n) Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: ag7xxx: Propagate errors on phy accessJoe Hershberger2017-08-071-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | Don't wait forever. Pass errors back to the caller. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Marek Vasut <marex@denx.de>
| * | net: ag7xxx: Comment register namesJoe Hershberger2017-08-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The register constants don't use the exact names that are used in the TRM, so add comments that use the exact names so that it is clear what register is being referred to. https://www.atheros-drivers.com/qualcomm-atheros-datasheets-for-AR9331.html Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Marek Vasut <marex@denx.de>
| * | net: usb: r8152: fix "duplicate 'const' declaration specifier"Philipp Tomsich2017-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After upgrading to GCC 7.1, the duplicate const specifies in the r8152 driver trigger the following build warnings with buildman (observed on a 'buildman rockchip' test):: ../drivers/usb/eth/r8152.c:62:35: warning: duplicate 'const' declaration specifier [-Wduplicate-decl-specifier] static const struct r8152_version const r8152_versions[] = { ^~~~~ This commit fixes these by removing the duplicate 'const' specifier from the declarations. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: add static to do_tftpput()Masahiro Yamada2017-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is only used in cmd/net.c Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | net: Get mac address from driver as seedJimmy Du2017-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously seeded by obtaining mac addr from env. If mac addr was never set, rand would output 0. This fix obtains the mac addr from driver instead. Signed-off-by: Jimmy Du <jimmy.du@ni.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | drivers/net/phy/fixed: do not overwrite addrChristian Gmeiner2017-08-071-1/+0
| |/ | | | | | | | | | | | | | | | | | | phy_device_create(..) sets the addr of phy_device with a sane value. There is no need overwrite it. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Hannes Schmelzer <oe5hpm@oevsv.at> Tested-by: Hannes Schmelzer <oe5hpm@oevsv.at> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | rockchip: video: defconfig: Add mipi dsi support for evb-rk3288eric.gao@rock-chips.com2017-08-071-0/+5
| | | | | | | | | | | | | | | | Add support for rk3288 mipi dsi. Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | rockchip: video: Makefile: Add soc specific driver for rk3288 mipi dsieric.gao@rock-chips.com2017-08-071-0/+1
| | | | | | | | | | | | Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | rockchip: video: mipi: Add rk3288 soc specific driver for mipi dsieric.gao@rock-chips.com2017-08-072-1/+192
| | | | | | | | | | | | | | | | Add rk3288 soc specific driver for mipi dsi. Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | rockchop: video: mipi: Makefile: Add soc specfic driver for rk3399 mipi dsieric.gao@rock-chips.com2017-08-071-1/+2
| | | | | | | | | | | | | | | | Add Makefile item for soc specific driver for rk3399 mipi dsi. Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | rockchip: video: mipi: Split mipi driver into common and specific partseric.gao@rock-chips.com2017-08-073-164/+220
| | | | | | | | | | | | | | | | | | | | | | To compatible with different rockchip soc, we split the mipi dirver into common and soc specific parts, and all the soc share the common functions from common driver part. Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> [agust: fix build breakage and warnings] Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | rockchip: defconfig: Increase max video resolution for mipi paneleric.gao@rock-chips.com2017-08-071-0/+1
| | | | | | | | | | | | | | | | The mipi panel used on evb-rk3399 has a 1920x1200 resolution. But now the max resolution is 1920x1080. So increase it. Signed-off-by: Eric Gao <eric.gao@rock-chips.com> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
* | video: Drop the ct69000 driverBin Meng2017-08-074-1208/+2
| | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* | video: Drop the sm501 driverBin Meng2017-08-074-262/+0
| | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* | video: Drop the sed156x driverBin Meng2017-08-073-573/+0
| | | | | | | | | | | | This is not used in U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* | video: Drop the l5f31188 driverBin Meng2017-08-072-193/+0
|/ | | | | | This is not used in U-Boot. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* common/env_embedded.c: rename PPCENV/PPCTEXT macrosThomas Petazzoni2017-08-042-7/+5
| | | | | | | | | | | | The environment has pretty much nothing to do with just "PPC", so rename the macros to just __UBOOT_ENV_SECTION__ which is more readable. In addition, only a single macro is needed: the environment now goes either to the default section (USE_HOSTCC is defined) or in the .text section. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* common/env_embedded.c: drop support for CONFIG_SYS_USE_PPCENVThomas Petazzoni2017-08-041-10/+3
| | | | | | | | | | | | | | | | | | | CONFIG_SYS_USE_PPCENV is no longer used anywhere. It was used to put the environment in the special .ppcenv section, but the last architecture using this section (SuperH) has been changed to not use it. Therefore, this commit drops support for CONFIG_SYS_USE_PPCENV entirely. We only handle two cases: - We're building the host tool tools/envcrc, in which case the environment is place with no special section attribute (so it depends up in .data) - We're building U-Boot itself, in which case the environnement is placed in the .text section. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Convert ARCH_OMAP2PLUS boards' CONFIG_SYS_TEXT_BASE to KconfigAdam Ford2017-08-0428-1/+30
| | | | | | | | | | | This converts the following to Kconfig: CONFIG_SYS_TEXT_BASE The includes, whitelist, etc. were left for now but I don't get any build errors or warnings on the omap3_logic_defconfig or am3517_evm_defconfig builds I tried. Signed-off-by: Adam Ford <aford173@gmail.com>