summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-10ppc4xx: Handle i2c stuck on combined xferDirk Eibach
ppc4xx i2c master gets stuck on errors while repeated start is active. Can be easily reproduced by "i2c md" on an unpopulated i2c address. There is not stop condition given, scl remains pulled low. The only way out seems to be doing a stop manually and then a soft reset. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Reviewed-by: Stefan Roese <sr@denx.de>
2014-11-10ppc4xx: Fix i2c repeated startDirk Eibach
Debugging some i2c trouble I saw on my scope that repeated start is not working properply. The 4xx even held clock pulled down after transfers. Having a look in the driver I realized that IIC_CNTL_RPST is set on that part of the transfer that should begin with a repeated start. But repeated start is about not sending a stop condition, so IIC_CNTL_RPST has to be set on the last transfer before the repeated start happens. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Reviewed-by: Stefan Roese <sr@denx.de>
2014-11-10bfin: the max bfin sdh block count is 127Sonic Zhang
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
2014-11-10bfin: make the CPU macro of LDR target more genenricSonic Zhang
Remove BFIN from the CPU macro in Makefile. Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
2014-11-10arm: rmobile: kconfig: Remove '+S:' prefix from defconfig filesNobuhiro Iwamatsu
'+S' is unnecessary because boards of rmobile do not use SPL. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: alt: Remove i2c_init functionNobuhiro Iwamatsu
The i2c_init function is no longer necessary. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: alt: Fix typo in comment for sh-i2cNobuhiro Iwamatsu
PowerIC connected to channel 1 of sh-i2c, not channel 2. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: alt: Enable channel 1 of sh-i2cNobuhiro Iwamatsu
Alt board was connected Power IC to channel 1 of sh-i2c. Source code that controls this is already included, but channel 1 of sh-i2c is not enabled. This enables channel 1 of sh-i2c, and can use. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Move rcar-i2c of the address defined to common headerNobuhiro Iwamatsu
R-Car SoCs of rmobile have same IP of rcar-i2c, and have same address. This moves rcar-i2c of the address defined to rcar-base.h as common header of R-Car SoCs. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Move sh-i2c of the address defined to common headerNobuhiro Iwamatsu
R-Car SoCs of rmobile have same IP of sh-i2c, and have same address. This moves sh-i2c of the address defined to rcar-base.h as common header of R-Car SoCs, and headers of each SoCs. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: alt: Remove board_late_init functionNobuhiro Iwamatsu
Alt board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: lager: Remove board_late_init functionNobuhiro Iwamatsu
Lager board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: koelsch: Remove board_late_init functionNobuhiro Iwamatsu
Koelsch board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add VFAT file system supportNobuhiro Iwamatsu
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add USB supportNobuhiro Iwamatsu
Gose board has two USB ports, and can use USB EHCI HCD driver of rmobile. This adds driver settings in order to use this driver. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add Ethernet supportNobuhiro Iwamatsu
Gose board has one ether port, this works using sh-ether driver. This adds GPIO settings and driver settings in order to use the sh-ether. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Add support gose boardNobuhiro Iwamatsu
The gose board has R8A7793, 1GB DDR3-SDRAM, USB, Ethernet, and more. This patch supports the following functions: - DDR3-SDRAM - SCIF - QSPI - SPI Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Add support R8A7793Nobuhiro Iwamatsu
Renesas R8A7793 is CPU with Cortex-A15. This supports the basic register definition and GPIO and framework of PFC. Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
2014-11-10board/renesas/ecovec/ecovec.c: fix buffer overflowWolfgang Denk
Fix error detected by cppcheck: [board/renesas/ecovec/ecovec.c:66]: (error) Buffer is accessed out of bounds. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-08usb_storage: blacklist Enclosure Service DevicesSoeren Moch
Skip enclosure service devices when probing for usb storage devices. This avoids long timeouts when probing for external usb harddisks which provide "Enclosure Services". Signed-off-by: Soeren Moch <smoch@web.de> -- This is a new version of the patch "usb_storage: skip all unknown devices when probing" http://http://lists.denx.de/pipermail/u-boot/2014-November/194622.html Cc: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@ti.com>
2014-11-07board/matrix_vision/mvblx/sys_eeprom.c: fix buffer overflowWolfgang Denk
Fix error detected by cppcheck: [board/matrix_vision/mvblx/sys_eeprom.c:353]: (error) Buffer is accessed out of bounds. Signed-off-by: Wolfgang Denk <wd@denx.de> cc: Michael Jones <michael.jones@matrix-vision.de> Acked-by: Michael Jones <michael.jones@matrix-vision.de>
2014-11-07common/cmd_fitupd.c: restore corrupted fileWolfgang Denk
This file got corrupted by the automatic editin of commit 1a45966 "Add GPL-2.0+ SPDX-License-Identifier to source files"; restore the opiginal content and manually insert the SPDX ID. The bug was detected by running cppcheck, which reported: [common/cmd_fitupd.c:8]: (error) Invalid number of character ({) when these macros are defined: 'CONFIG_UPDATE_TFTP'. Signed-off-by: Wolfgang Denk <wd@denx.de>
2014-11-07drivers/net/uli526x.c: fix syntax errorWolfgang Denk
Fix error detected by cppcheck: [drivers/net/uli526x.c:551]: (error) printf format string requires 3 parameters but only 2 are given. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Roy Zang <tie-fei.zang@freescale.com>
2014-11-07board/cogent/lcd.c: fix syntax errorWolfgang Denk
Fix error detected by cppcheck: [board/cogent/lcd.c:237]: (error) Invalid number of character (() when these macros are defined: 'CONFIG_SHOW_ACTIVITY;CONFIG_STATUS_LED'. Signed-off-by: Wolfgang Denk <wd@denx.de>
2014-11-07cppcheck cleanup: fix nullPointer errorsWolfgang Denk
There are a number of places where U-Boot intentionally and legally accesses physical address 0x0000, for example when installing exception vectors on systems where these are located in low memory. Add "cppcheck-suppress nullPointer" comments to silence cppcheck where this is intentional and legal. Signed-off-by: Wolfgang Denk <wd@denx.de>
2014-11-07doc: fix documentation of out-of-tree buildTimo Ketola
Correct environment variable for output directory is KBUILD_OUTPUT. Signed-off-by: Timo Ketola <timo@exertus.fi>
2014-11-07tools/env: Fix environment size and CRC on 64-bit hostsDominic Sacré
On architectures where 'long' is 64 bit, the u-boot environment as seen by the fw_env tools was missing 4 bytes. This patch fixes getenvsize(), and thus also ensures that the environment's CRC32 checksum is calculated correctly. Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> Cc: Wolfgang Denk <wd@denx.de> Cc: Tom Rini <trini@ti.com>
2014-11-07MAINTAINERS: CFI flash maintainership only includes the CFI related filesStefan Roese
All the other files in drivers/mtd/* are not really CFI related. So lets only include the files that are CFI specific. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Scott Wood <scottwood@freescale.com> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Jagan Teki <jagannadh.teki@gmail.com> Acked-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com> Acked-by: Heiko Schocher <hs@denx.de>
2014-11-07kbuild: sync misc scripts with Linux 3.18-rc1Masahiro Yamada
This commit imports some updates in misc scripts from Linux 3.18-rc1. [1] commit cbb4d3e6510b99522719c5ef0 by Horia Geanta scripts/kernel-doc: handle object-like macros [2] commit 164f0d2efaaef83 by Michal Marek kbuild: Fix handling of backslashes in *.cmd files [3] commit 270a00963cd367214e by Randy Dunlap scripts/kernel-doc: recognize __meminit [4] commit a4954fd7724c0f55361eb5 by Masahiro Yamada kbuild: remove obj-n and lib-n handling [5] commit 5b2389b45d1a9c12b9f by Masahiro Yamada kbuild: simplify build, clean, modbuiltin shorthands Signed-off-by: Horia Geanta <horia.geanta@freescale.com> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07kconfig: sync kconfig files with Linux 3.18-rc1Masahiro Yamada
This commit imports Kconfig updates from Linux 3.18-rc1. 'kvmconfig' and 'tinyconfig' help message have been commented out since they are unavailable at least now; in the future perhaps we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to create a very small U-Boot image. [1] commit 3aaefce10351 by Josh Triplett x86, platform, kconfig: move kvmconfig functionality to a helper [2] commit 0da1d4a0b951 by Josh Triplett x86: Add "make tinyconfig" to configure the tiniest possible kernel [3] commit c40724d3f381 by Brian Norris kconfig: lxdialog: fix spelling [4] commit 7285996aa000 by Brian Norris kconfig: nconfig: fix multi-byte UTF handling Signed-off-by: Josh Triplett <josh@joshtriplett.org> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07kbuild: sync top Makefile with Linux 3.18-rc1Masahiro Yamada
Since Linux 3.15, relative path feature and related fixes, cleanups have been merged to the top Makefile. The relative path feature looks stable enough, so let's import it to U-Boot along with various cleanups. Commits imported from Linux (some need adjustment) are: [1] commit 7e1c04779efd by Michal Marek kbuild: Use relative path for $(objtree) [2] commit 890676c65d69 by Michal Marek kbuild: Use relative path when building in the source tree [3] commit 9da0763bdd82 by Michal Marek kbuild: Use relative path when building in a subdir of the source tree [4] commit c2e28dc975ea by Michal Marek kbuild: Print the name of the build directory [5] commit 066b7ed95580 by Michal Marek kbuild: Do not print the build directory with make -s [6] commit 3f1d9a6cec01 by Michal Marek kbuild: make -s should be used with kernelrelease/kernelversion/image_name [7] commit 7ff525712acf by Masahiro Yamada kbuild: fake the "Entering directory ..." message more simply [8] commit 745a254322c8 by Masahiro Yamada kbuild: use $(Q) for sub-make target [9] commit aa55c8e2f7a3 by Masahiro Yamada kbuild: handle C=... and M=... after entering into build directory [10] commit ab7474ea5361 by Borislav Petkov Kbuild: Ignore GREP_OPTIONS env variable To use relative path feature, tools/Makefile and scripts/Makefile.autoconf must be tweaked. Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07kbuild: improve multi-objs dependency and cleanupsMasahiro Yamada
Since Linux 3.18-rc1, Kbuild is able to handle multi-objs dependency correctly, which also allows us futher cleanups of some makefiles. This commit imports those commits: [1] commit c8589d1e9e01 by Masahiro Yamada kbuild: handle multi-objs dependency appropriately [2] commit 97e3226e6e98 by Masahiro Yamada kbuild: handle the dependency of multi-objs hostprogs appropriately [3] commit 022af62d0190 by Masahiro Yamada kbuild: refactor script/kconfig/Makefile [4] commit 221ecca6cafe by Masahiro Yamada kbuild: remove redundant clean-files from scripts/kconfig/Makefile Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07kbuild: bug fixes and cleanups of Makefile.hostMasahiro Yamada
This commit imports updates of scripts/Makefile.host from Linux 3.18-rc1. Imported commits are: [1] commit d8d9efe22709 by Masahiro Yamada kbuild: fix a typo in scripts/Makefile.host [2] commit edb950c17de0 by Masahiro Yamada kbuild: fix a bug of C++ host program handling [3] commit 62e2210798ed by Masahiro Yamada kbuild: drop shared library support from Makefile.host [4] commit 663935593915 by Masahiro Yamada kbuild: clean up scripts/Makefile.host [5] commit 1791ff7179f6 by Masahiro Yamada kbuild: clean-up and bug fix of scripts/Makefile.host Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07kbuild: remove "clobber" targetMasahiro Yamada
Now we stick to Linux Kernel's build system, so squash "clobber" to "clean" target. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07hush: make run_command() return an error on parsing failureRabin Vincent
run_command() returns success even if the command had a syntax error; correct this behaviour. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org)
2014-11-07hush: fix segfault on syntax errorRabin Vincent
Hush segfaults if it sees a syntax error while attempting to parse a command: $ ./u-boot -c "'" ... syntax error Segmentation fault (core dumped) This is due to a NULL pointer dereference of in_str->p in static_peek(). The problem is that the exit condition for the loop in parse_stream_outer() checks for rcode not being -1, but rcode is only ever 0 or 1. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org) Tested-by: Simon Glass <sjg@chromium.org)
2014-11-07hush: return consistent codes from run_command()Rabin Vincent
Attempting to run: - an empty string - a string with just spaces returns different error codes, 1 for the empty string and 0 for the string with just spaces. Make both of them return 0 for consistency. Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org)
2014-11-07sandbox: init cli for -cRabin Vincent
sandbox crashes if a variable is set in the -c command, because hush's top_vars is not allocated. Call cli_init() from sandbox to ensure this is done before we execute the -c command. $ ./u-boot -c 'a=1' ... Segmentation fault (core dumped) Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org) Tested-by: Simon Glass <sjg@chromium.org)
2014-11-07dlmalloc: ensure gd is set for early allocRabin Vincent
Attempting to run the sandbox leads to a segfault, because some dynamic libraries (outside of u-boot) attempt to use malloc() to allocate memory before u-boot's gd variable is initialized. Check for gd not being NULL in the SYS_MALLOC_F_LEN handling, so that malloc() doesn't crash when called at this point. $ gdb -q --args ./u-boot (gdb) r Program received signal SIGSEGV, Segmentation fault. 0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184 2184 if (!(gd->flags & GD_FLG_RELOC)) { (gdb) p gd $1 = (gd_t *) 0x0 (gdb) bt #0 0x0000000000412b9b in malloc (bytes=bytes@entry=37) at common/dlmalloc.c:2184 #1 0x00007ffff75bf8e1 in set_binding_values (domainname=0x7ffff11f4f12 "libgpg-error", dirnamep=0x7fffffffe168, codesetp=0x0) at bindtextdom.c:228 #2 0x00007ffff75bfb4c in set_binding_values (codesetp=0x0, dirnamep=0x7fffffffe168, domainname=<optimized out>) at bindtextdom.c:350 #3 __bindtextdomain (domainname=<optimized out>, dirname=0x7ffff11f4f00 "/usr/share/locale") at bindtextdom.c:348 #4 0x00007ffff11eca17 in ?? () from /lib/x86_64-linux-gnu/libgpg-error.so.0 #5 0x00007ffff7dea9fa in call_init (l=<optimized out>, argc=argc@entry=1, argv=argv@entry=0x7fffffffe208, env=env@entry=0x7fffffffe218) at dl-init.c:78 #6 0x00007ffff7deaae3 in call_init (env=0x7fffffffe218, argv=0x7fffffffe208, argc=1, l=<optimized out>) at dl-init.c:36 #7 _dl_init (main_map=0x7ffff7ffe1a8, argc=1, argv=0x7fffffffe208, env=0x7fffffffe218) at dl-init.c:126 #8 0x00007ffff7ddd1ca in _dl_start_user () from /lib64/ld-linux-x86-64.so.2 Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Simon Glass <sjg@chromium.org>
2014-11-07power_spi.c: Rewrite pmic_reg functionTom Rini
The pmic_spi_free function isn't ever used, and as the frameworks stand today, cannot be, so remove it. Integrate the probe function into pmic_reg as it's not really a "probe" today. Finally, add an err label for the common failure cases. Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Stefano Babic <sbabic@denx.de> Signed-off-by: Tom Rini <trini@ti.com> Acked-by: Stefano Babic <sbabic@denx.de>
2014-11-07image-fdt: boot_get_fdt() return value when no DTB existsNoam Camus
I believe that when no DTB is around we should return 1. This why I fixed such scenarious to not return zero anymore. Else kernel might get NULL pointer to DTB which doesn't exists. Signed-off-by: Noam Camus <noamc@ezchip.com>
2014-11-07powerpc: o2dnt: convert to generic boardAnatolij Gustschin
Signed-off-by: Anatolij Gustschin <agust@denx.de>
2014-11-07net: smc911x: Keep MAC programmedMarek Vasut
Make sure to keep the MAC address programmed in the SMC911x ADDRH and ADDRL registers. Linux can read those registers to determine the MAC address on EEPROM-less configurations. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Tom Rini <trini@ti.com>
2014-11-07sort drivers/mmc/MakefilePavel Machek
Sort drivers/mmc makefile, as requested by wd. Signed-off-by: Pavel Machek <pavel@denx.de> Acked-by: Chin Liang See <clsee@altera.com>
2014-11-07generic-board: make compile-time noise for non-generic boardsMasahiro Yamada
Commit 0f605c1501f6 (Start the deprecation process for generic board) added a run-time warning message. Let's be noisier for non-generic boards to inform the dead line of the conversion. This commit intentionally outputs a warning message to stdout. We still have many unconverted boards. If we print the message to stderr, MAKEALL and buildman will report tons of broken boards and really important information will be buried. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Marek Vasut <marex@denx.de> Acked-by: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com>
2014-11-07Merge git://git.denx.de/u-boot-tiTom Rini
2014-11-07usb: eth: fix MakefileRene Griessl
fix obj-y term Signed-off-by: Rene Griessl <rgriessl@cit-ec.uni-bielefeld.de>
2014-11-07usb: include <asm/cache.h> and <part.h> from include/usb.hMasahiro Yamada
The header file include/usb.h references ARCH_DMA_MINALIGH and block_dev_desc_t, thus it must include <asm/cache.h> and <part.h>. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07usb: rmobile: Use ARRAY_SIZE(usb_base_address) instead of ↵Nobuhiro Iwamatsu
CONFIG_USB_MAX_CONTROLLER_COUNT Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Marek Vasut <marex@denx.de>
2014-11-07usb: ehci: fix Interrupt on Doorbell flag of USBCMDMasahiro Yamada
CMD_IAAD (Interrupt on Async Advance Doorbell) is bit 6, not bit 5. While we are here, sort the flags. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>