summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MAINTAINERS/mailmap: Update my email addressFabio Estevam2016-01-1112-12/+12
| | | | | | Update my email address to the NXP account. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2016-01-102-6/+7
|\
| * cgtqmx6eval: README: Fix parameter of 'sf write' commandOtavio Salvador2016-01-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | 'sf command' should receive the length in sector boundaries, so fix it accordingly. Also, show the steps to set the server and board IP addresses for making the steps clearer. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
| * mx6cuboxi: Remove obsolete commentFabio Estevam2016-01-101-4/+0
| | | | | | | | | | | | | | | | | | We currently support various versions of Solidrun mx6 boards, so remove the obsolete comment. Reported-by: Jon Nettleton <jon.nettleton@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * mx6cuboxi: Fix the reset delay for the AR8035 PHYFabio Estevam2016-01-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 59370f3fcd1350 ("net: phy: delay only if reset handler is registered") Ethernet is no longer functional: Booting from net ... FEC Waiting for PHY auto negotiation to complete......... TIMEOUT ! BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 This commit does not have an issue in itself, but it revelead a problem with the Ethernet initialization. As per the AR8035 datasheet: "For a reliable power on reset, suggest to keep asserting the reset low long enough (10ms) to ensure the clock is stable and clock-to-reset 1ms requirement is satisfied." So do as suggested and keep the reset low for 10ms. Also add a 100us delay after deasserting the reset line to guarantee that the PHY ID can be read correctly and the Atheros PHY can be loaded as per Troy Kisky's suggestion. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Tested-by: Tom Rini <trini@konsulko.com>
* | Merge git://git.denx.de/u-boot-rockchipTom Rini2016-01-085-5/+11
|\ \
| * | rockchip: Fix the configuration for chromebook_jerrySimon Glass2016-01-083-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Various updates did not make it through to this board. Also the instructions for building a SPI image are no-longer correct. Fix these so that Jerry can boot to a prompt again. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | rockchip: Drop a debug message when outputing SPI imagesSimon Glass2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | There is an unnecessary sector count displayed. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | rockchip: Enable generation of SPI imagesSimon Glass2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | This feature was dropped at some point. Restore it. Signed-off-by: Simon Glass <sjg@chromium.org>
* | | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2016-01-089-79/+41
|\ \ \ | | |/ | |/|
| * | imx_watchdog: always set minimal timeout in reset_cpuAndrey Skvortsov2016-01-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that timeout bits in WCR register were leaved unchanged. So previously set timeout value was applied and therefore 'reset' command takes any value up to two minutes, depending on previous watchdog settings, instead of minimal 0.5 seconds. Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>
| * | gpio: mxs: add name_to_gpio() functionMåns Rullgård2016-01-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override the default name_to_gpio() function with one that accepts strings of the form bank:pin. If a colon is present in the provided name, it behaves like the default version. This lets the "gpio" command work with sane names rather than requiring the user to enter the bank/pin composite in decimal. Signed-off-by: Mans Rullgard <mans@mansr.com> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | imx: mx7: fix the temperature checking for Rev1.1Peng Fan2016-01-071-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To TO1.0, we can not rely on finish bit to read temperature. But to TO1.1, the issue was fixed by IC, we can rely on finish bit for temperature reading for TO1.1. Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Adrian Alonso <aalonso@freescale.com>
| * | imx: mx6ul: disable VIDEO for SPLPeng Fan2016-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With DEBUG macro enabled, SPL build failure: " arch/arm/cpu/armv7/built-in.o: In function `reset_misc': ~/uboot/arch/arm/cpu/armv7/mx6/soc.c:406: undefined reference to `lcdif_power_down' scripts/Makefile.spl:244: recipe for target 'spl/u-boot-spl' failed " Wrap VIDEO settings with ifndef CONFIG_SPL_BUILD Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | pfuze: Fix unsigned variable for less-than-zero comparisonYe.Li2016-01-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the Coverity result, a unsigned int variable is used fo less- than-zero comparison, the result is never true. Need to fix the variable type to signed int. Signed-off-by: Ye.Li <B37916@freescale.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * | wandboard: Simplify the Ethernet PHY configurationFabio Estevam2016-01-071-34/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the AR8031 datasheet: "For a reliable power on reset, suggest to keep asserting the reset low long enough (10ms) to ensure the clock is stable and clock-to-reset 1ms requirement is satisfied." So do as suggested and also add a 100us delay after deasserting the reset line to guarantee that the PHY ID can be read correctly and the Atheros 8031 PHY driver can be loaded automatically. This results in a simpler code. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | mx6sabresd: Simplify the Ethernet PHY configurationFabio Estevam2016-01-071-34/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the AR8031 datasheet: "For a reliable power on reset, suggest to keep asserting the reset low long enough (10ms) to ensure the clock is stable and clock-to-reset 1ms requirement is satisfied." So do as suggested and also add a 100us delay after deasserting the reset line to guarantee that the PHY ID can be read correctly and the Atheros 8031 PHY driver can be loaded automatically. This results in a simpler code. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| * | phy: atheros: Use ar8035_config for AR8031Fabio Estevam2016-01-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 08ad9b068afb88 (" ar8031: modify the config func of ar8031 to ar8021_config") selected 'ar8021_config' as the configuration function for AR8031. The correct would be to use 'ar8035_config' instead as AR8031/AR8035 have the same programming model and even share the same phy driver in the linux kernel: drivers/net/phy/at803x.c. Tested on a mx6qsabresd and wandboard, which now can work without any PHY setup code in the board files. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
* | pci: layerscape: Adjust the return value when ls_pcie_addr_valid() failsBin Meng2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | When trying to access non-existent/unsupported PCI devices in ls_pcie_read_config(), when ls_pcie_addr_valid() fails it returns error code and fills in the result with 0xffffffff manually. But it really should return zero to upper layer codes. Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
* | pci: imx: Adjust the return value when imx_pcie_addr_valid() failsBin Meng2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | When trying to access non-existent/unsupported PCI devices in imx_pcie_read_config(), when imx_pcie_addr_valid() fails it returns error code and fills in the result with 0xffffffff manually. But it really should return zero to upper layer codes. Reported-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
* | fs: handle the fileaddr variable in the same way as in the network caseDavid Müller (ELSOFT AG)2016-01-081-0/+1
| | | | | | | | Signed-off-by: David Müller <d.mueller@elsoft.ch>
* | get_maintainer: fix perl 5.22/5.24 deprecated/incompatible "\C" useHeiko Schocher2016-01-081-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | from linux commit ce8155f7a3d5: Perl 5.22 emits a deprecated message when "\C" is used in a regex. Perl 5.24 will disallow it altogether. Fix it by using [A-Z] instead of \C. >From linux adapted to U-Boot by: Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andre Przywara <andre.przywara@arm.com>
* | fix always succesful memory testRasmus Villemoes2016-01-081-2/+2
| | | | | | | | | | | | | | | | | | Since 51209b1f42cb ("Use common mtest iteration counting"), do_mem_mtest has always reported 0 errors and hence returned 0, even if errors were detected. Fix the helpers mem_test_alt() and mem_test_quick() to return the number of errors found. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
* | cyrus: Enable STDIO deregisterAndy Fleming2016-01-081-0/+1
| | | | | | | | | | | | | | | | If CONFIG_SYS_STDIO_DEREGISTER is not enabled, usb reset will fail every time. Enabling it allows usb reset to work. Signed-off-by: Andy Fleming <afleming@gmail.com>
* | MAINTAINERS, .mailmap: Update my email addressYork Sun2016-01-084-5/+6
| | | | | | | | | | | | Change from yorksun@freescale.com to york.sun@nxp.com. Signed-off-by: York Sun <york.sun@nxp.com>
* | am33xx/am43xx: Add platform data for GPIOsTom Rini2016-01-081-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | On these platforms we have many cases of boards that enable device model and GPIO support but do not enable OF_CONTROL and pass in a device tree with the binary. We need to bring in the platform data here as well. Tested on Beaglebone Black. Reported-by: Robert Nelson <robertcnelson@gmail.com> Reported-by: Francisco Aguerre <franciscoaguerre@gmail.com> Reported-by: Jason Kridner <jkridner@beagleboard.org> Signed-off-by: Tom Rini <trini@konsulko.com>
* | serial: zynq: Use static inline for _debug_uart_init()Michal Simek2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mark _debug_uart_init() as static to avoid sparse warning and inline it to debug_uart_init(). Reported-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
* | net: remove scary warning about EEPROM provided MAC addressAndre Przywara2016-01-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In many parts of the computing world having a unique MAC address sitting in some on-NIC storage is considered the normal case. Remove the warning to not scare the user unnecessarily. This applies to Highbank/Midway and ARM's Juno, for instance. Besides that this fixes the formatting on Midway, for instance, which currently looks like: ... Net: xgmac0 Warning: xgmac0 using MAC address from net device , xgmac1 Warning: xgmac1 using MAC address from net device ... Signed-off-by: Andre Przywara <andre.przywara@arm.com>
* | arm64: Juno/FVP: adjust kernel load addressAndre Przywara2016-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default kernel load offset for an arm64 kernel is 0x80000, so U-Boot takes cares of moving the loaded kernel to a matching memory location just before booting it. Since we run with caches off, this takes a while for any decently sized kernel - with no output explaining the reason for the delay (unless one uses a DEBUG build). By adjusting the default load offset for Juno and VFP to be 512K aligned in the first place we can skip this copying and boot much faster. Tested on Juno. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Ryan Harkin <ryan.harkin@linaro.org>
* | arm, Makefile: correct compilation flag for u-boot-dtbAneesh Bansal2016-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The compilation of u-boot-dtb.img should be controlled by CONFIG_OF_CONTROL and not CONFIG_DM. CONFIG_DM may be defined even without Device Tree requirement. This was added in commit 947cee1127c5fa97529c8cda4f0b48d141f92560. Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com> Signed-off-by: Aneesh Bansal <aneesh.bansal@freescale.com> CC: Alison Wang <alison.wang@freescale.com>
* | bootcount: Correct #endif comment to match, other aestheticsRobert P. J. Day2016-01-081-6/+4
| | | | | | | | | | | | | | | | | | Correct mismatched comment on #endif to agree with its #if defined(). Also add some missing #endif comments for consistency, take out extraneous blank lines for readability. rday
* | doc: Tidy up first part of top-level README fileRobert P. J. Day2016-01-081-85/+43
| | | | | | | | | | | | | | | | | | | | | | | | First (small) pass at tidying up the README file, including: * remove references to obsolete CREDITS file * remove (some) references to obsolete boards.cfg file * remove at least one reference to a "scrapped" board * cut down unnecessarily detailed directory hierarchy * bunch of grammar and spelling tweaks Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | powerpc: Various typo fixes under arch/powerpc/cpu/mpc83xxRobert P. J. Day2016-01-086-20/+20
| | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | include: Correct "requset" typoes in misc.hRobert P. J. Day2016-01-081-2/+2
| | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Acked-by: Thomas Chou <thomas@wytron.com.tw>
* | Merge git://git.denx.de/u-boot-dmTom Rini2016-01-089-17/+83
|\ \
| * | net: Fix delay in net_retry testJoe Hershberger2016-01-072-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 45b4773 (net/arp: account for ARP delay, avoid duplicate packets on timeout) Check the arp timeout and adjust the timeout start time before the call to eth_recv() so that the sandbox driver has the opportunity to adjust the sandbox timer after the new start time has been recorded. Also, change the adjustment amount by 11 seconds instead of exactly the 10 seconds that the ping timout is expecting since the timeout check is looking for the time elapsed to be greater than but not equal to the specified delay. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Acked-by: Simon Glass <sjg@chromium.org>
| * | fdt: fix address cell count checking in fdt_translate_address()Przemyslaw Marczak2016-01-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit: dm: core: Enable optional use of fdt_translate_address() Enables use of this function as default, but after this it's not possible to get dev address for the case in which: '#size-cells == 0' This causes errors when getting address for some GPIOs, for which the '#size-cells' is set to 0. Example error: '__of_translate_address: Bad cell count for gpx0' Allowing for that case by modifying the macro 'OF_CHECK_COUNTS', (called from )__of_translate_address(), fixes the issue. Now, this macro doesn't check, that '#size-cells' is greater than 0. This is possible from the specification point of view, but I'm not sure that it doesn't introduce a regression for other configs. Please test and share the results. Tested-on: Odroid U3, Odroid X2, Odroid XU3, Sandbox. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Masahiro Yamada <yamada.masahiro@socionext.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Jaehoon Chung <jh80.chung@samsung.com> Cc: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Bin Meng <bmeng.cn@gmail.com> Cc: Marek Vasut <marex@denx.de> Tested-by: Jaehoon Chung <jh80.chung@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
| * | dm: usb: Add a remove() method for USB keyboardsSimon Glass2016-01-071-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | At present USB keyboards are not properly removed with driver model. Add the code to handle this. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
| * | usb: Allow up to 7 storage devicesSimon Glass2016-01-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current limit of 5 is not enough for the driver model USB tests. Really we should not have a limit but the driver model code still uses the usb_dev_desc[] array, which has a limit. Increasing the limit by 2 should not bother anyone. Adjust it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Marek Vasut <marex@denx.de>
| * | dm: Disable all SPI and SPI flash testsSimon Glass2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This subsystem has been broken since commit: 4efad20a sf: Update status reg check in spi_flash_cmd_wait_ready There has so far been no response from the maintainer, and a release is imminent. For now, let's just disable the tests. Signed-off-by: Simon Glass <sjg@chromium.org>
| * | dm: eth: Stick to 'ethact' when 'ethrotate' is 'no' in eth_init()Bin Meng2016-01-071-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 'ethrotate' variable is set to 'no' and 'ethact' variable is already set to an ethernet device, we should stick to 'ethact'. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
| * | dm: eth: Test 'ethrotate' before changing current ethernet deviceBin Meng2016-01-071-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In eth_current_changed(), the call to eth_get_dev() below has a side effect of rotating ethernet device if uc_priv->current == NULL. This is not what we want when 'ethrotate' variable is 'no'. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
| * | test: add sandbox timer to test.dtsThomas Chou2016-01-071-0/+5
| |/ | | | | | | | | | | | | | | Add missing sandbox timer to test.dts, so that test-dm works. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2016-01-072-3/+3
|\ \ | |/ |/|
| * spi: fsl_qspi: fix an error of using GENMASKGong Qianyu2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | This commit fixes the change of below commit "spi: fsl_qspi: Use GENMASK" (sha1 :bad490a24212c068c5b718b9189f47ea4075d078) Signed-off-by: Gong Qianyu <Qianyu.Gong@freescale.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
| * spi: spi_flash: Fix the arguments of stm_is_locked_sr()Fabio Estevam2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | stm_is_locked_sr() takes the status register (SR) value as the last parameter, not the second. Based on a patch from Brian Norris for the linux kernel: http://git.infradead.org/linux-mtd.git/commit/a32d5b726ff8cf32bf491522b0ac8ae2545a063e Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* | Merge git://git.denx.de/u-boot-mpc85xxTom Rini2016-01-071-0/+2
|\ \
| * | powerpc, mpc5xxx: fix missing bootflag initHeiko Schocher2016-01-051-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since: commit: f05ad9ba "Add a way to skip relocation" tqm5200s board fails to boot. Reason is that board_init_f has a function parameter bootflag, which is not setup in in arch/powerpc/cpu/mpc5xxx/start.S _start So board_init_f gets a undefined bootflag, currently the gd pointer address. Unfortunately this address sets the GD_FLG_SKIP_RELOC bit, so u-boot code gets not relocated and u-boot does not boot ... Init bootflag with 0, and tqm5200 boots fine again. Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: York Sun <yorksun@freescale.com>
* | Prepare v2016.01-rc4Tom Rini2016-01-041-1/+1
| | | | | | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* | common: nvedit: use snprintf instead of sprintfPeng Fan2016-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use snprintf to replace sprintf. Coverity log: " Unbounded source buffer (STRING_SIZE) string_size: Passing string init_val of unknown size to sprintf. " Reported-by: Coverity Signed-off-by: Peng Fan <peng.fan@nxp.com> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
OpenPOWER on IntegriCloud