summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* linux/compat.h: port lower_32_bits and upper_32_bits from LinuxLijun Pan2014-07-22-0/+19
| | | | | | | | | | | | | | [backport from linux commit 204b885e and 218e180e7] 64 bit processors are becomming more and more popular. lower_32_bits and upper_32_bits save our labor doing shifts/manipulations like (u32)(n) and (u32)((n) >> 32). They are good helpers in both little and big endian cases. Port these two functions here from Linux:include/linux/kernel.h, cater the comment message to little/big endian cases. Later on, developers could include linux/compat.h if they want to use these two functions. Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com>
* sparc: merge LEON2 and LEON3 linker scriptsMasahiro Yamada2014-07-22-146/+2
| | | | | | | | | | | | | | | | | | There is only one line diff between LEON2 and LEON3 linker scripts: - arch/sparc/cpu/leon2/start.o (.text) + arch/sparc/cpu/leon3/start.o (.text) They can be written in the same way: */start.o (.text) So, board/gaisler/grsim_leon2/u-boot.lds and arch/sparc/cpu/leon3/u-boot.lds can be merged into arch/sparc/cpu/u-boot.lds. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* sparc: merge LEON3 linker scriptsMasahiro Yamada2014-07-22-431/+0
| | | | | | | | | | | | | | | | The linker scripts of LEON3 - board/gaisler/grsim/u-boot.lds - board/gaisler/gr_cpci_ax2000/u-boot.lds - board/gaisler/gr_ep2s60/u-boot.lds - board/gaisler/gr_xc3s_1500/u-boot.lds are the same (except cosmetic differences such as indentation). This commit merges them into arch/sparc/cpu/leon3/u-boot.lds. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Daniel Hellstrom <daniel@gaisler.com>
* esd:cmd_loadpci.c: Switch from "do_source" to "source"Tom Rini2014-07-22-7/+1
| | | | | | | | Rather than calling do_source directly (which is not officially exported from cmd_source.c) call 'source' which is exported and requires a little less code to do so as well. Signed-off-by: Tom Rini <trini@ti.com>
* Merge branch 'master' of git://git.denx.de/u-boot-i2cTom Rini2014-07-21-2/+77
|\
| * fsl_i2c: add support for 3rd and 4th I2CShengzhou Liu2014-07-16-2/+20
| | | | | | | | | | | | Add support for 3rd and 4th I2C. Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
| * i2c, omap24xx: add i2c deblock sequenzHeiko Schocher2014-07-16-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a bus busy is detected when intializing the driver, toggle 9 times the scl pin. Therefore enable the test mode of the controller, in which the scl, sda pins can be controlled manually. Tested on the siemens boards pxm2, rut and dxr2. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Hannes Petermaier <oe5hpm@oevsv.at> Cc: Lubomir Popov <lpopov@mm-sol.com> Cc: Steve Sakoman <steve@sakoman.com> Cc: Sandeep Paulraj <s-paulraj@ti.com> Cc: Vincent Stehlé <v-stehle@ti.com> Cc: Samuel Egli <samuel.egli@siemens.com>
* | common: cmd_mii: fix printf format warningJeroen Hofstee2014-07-18-4/+4
| | | | | | | | | | | | | | | | The and operator implicitly upcasts the value to int, hence the format should expect an int type as well. (and make checkpatch happy) Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | autoboot: add its own headerJeroen Hofstee2014-07-18-0/+1
| | | | | | | | Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | board: rpi_b: include mmc header and fix prototypeJeroen Hofstee2014-07-18-1/+3
| | | | | | | | | | | | | | While at it add fdt_support.h as well. cc: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | mmc: prevent some warnings with make W=1Jeroen Hofstee2014-07-18-5/+7
| | | | | | | | | | | | | | | | Add missing prototypes for global functions and make local functions static. cc: panto@antoniou-consulting.com Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | common: env_common: make env_get_char_spec __weakJeroen Hofstee2014-07-18-3/+1
| | | | | | | | Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | yaffs2: preprocessor cleanupJeroen Hofstee2014-07-18-11/+10
| | | | | | | | | | | | | | | | | | Current code uses the preprocessor to change an else case to a statement without any if condition at all. Although this works, change the optional code to return early, so all optional code is contained within a single #ifdef. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | yaffs2: cosmetic: remove self assignmentsJeroen Hofstee2014-07-18-22/+1
| | | | | | | | | | | | | | | | | | Remove self assignments which is just dead code to prevent compiler warnings about non used arguments. For u-boot this does not prevent any warning though, on the contrary it actual introduces warnings when compiling with clang. Remove them. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | common: bootm_os: make arch_preboot_os __weakJeroen Hofstee2014-07-18-2/+1
| | | | | | | | Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | dirvers: mmc: use __weakJeroen Hofstee2014-07-18-11/+9
| | | | | | | | | | use weak instead of alias to prevent some clang warnings. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | lib:vsprintf: reduce scope of pack_hex_byteJeroen Hofstee2014-07-18-11/+11
| | | | | | | | | | | | | | | | pack_hex_byte is only used when CONFIG_CMD_NET is defined so limit it to that scope. This prevents a clang warning. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | env_callback.h: spl: mark callback as maybe_unusedJeroen Hofstee2014-07-18-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | When static inline is used in a header file the function should preferably be inlined and if not possible made a static function. When declared inside a c file there is a static function, which might be inlined. Since SPL uses a define to declare the static inline it becomes part of the c file although it is declared in a header and clang will warn that you have introduced unused static functions. Add maybe_unused to prevent such warnings. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | lib:sha1: remove unused constantJeroen Hofstee2014-07-18-2/+0
| | | | | | | | | | This prevents a clang warning. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | common: main.c: make show_boot_progress __weakJeroen Hofstee2014-07-18-2/+1
| | | | | | | | | | | | | | | | This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Acked-by: Simon Glass <sjg@chromium.org>
* | lib:lmb: use __weakJeroen Hofstee2014-07-18-4/+2
| | | | | | | | | | | | | | This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | common:splash: use __weakJeroen Hofstee2014-07-18-5/+1
| | | | | | | | | | | | | | | | This not only looks a bit better it also prevents a warning with W=1 (no previous prototype). cc: agust@denx.de Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | dm: add missing includesJeroen Hofstee2014-07-18-0/+2
| | | | | | | | | | | | | | | | | | | | lists.c / root.c do not include their own header and they could potentially implement a different function. Therefore actually include the headers. cc: sjg@chromium.org Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Acked-by: Simon Glass <sjg@chromium.org>
* | common: board_f: cosmetic use __weak for ledsJeroen Hofstee2014-07-18-30/+21
| | | | | | | | | | | | | | | | | | | | First of all this looks a lot better, but it also prevents a gcc warning (W=1), that the weak function has no previous prototype. cc: Simon Glass <sjg@chromium.org> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> Acked-by: Simon Glass <sjg@chromium.org>
* | common: commands: make commands staticJeroen Hofstee2014-07-18-28/+36
| | | | | | | | | | | | | | Since most commands are not public, make them static. This prevents warnings that no common prototype is available. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | lib: div64: add missing includeJeroen Hofstee2014-07-18-0/+1
| | | | | | | | | | | | | | Include the function its prototype to prevent the warning that it has no prototype. Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* | mtd: cfi_flash: fix clang warningJeroen Hofstee2014-07-18-1/+1
|/ | | | | | | | | | | | clang warns this check is silly; it is since s is a local variable. u-boot/drivers/mtd/cfi_flash.c:2363:13: warning: comparison of array 's' not equal to a null pointer is always true else if ((s != NULL) && (strcmp(s, "yes") == 0)) { cc: Stefan Roese <sr@denx.de> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
* Prepare v2014.07Tom Rini2014-07-14-1/+1
| | | | Signed-off-by: Tom Rini <trini@ti.com>
* socfpga: timer actually counts downPavel Machek2014-07-14-0/+1
| | | | | | | | | | | | Timer on cyclone5 actually counts down. It took me a while to figure out, as timer counting in wrong direction actually _can_ be used, it just appears to tick at extremely high frequency in u-boot. The bug was introduced in commit 23ab7ee0ffa9d5efd0b4ad830befba306d24a327. Signed-off-by: Pavel Machek <pavel@denx.de> Acked-by: Marek Vasut <marex@denx.de>
* ARM: DRA7xx: Update the board_name env variableLokesh Vutla2014-07-14-0/+9
| | | | | | | Update the board_name env variable and accordingly populate the dtb file. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
* boards.cfg: change "<none>" in the board field to "-"Masahiro Yamada2014-07-14-9/+3
| | | | | | | | | | | In the previous commit, all the board fields were filled. Now we can use "-" in the board field for a different meaning. Going forward, "-" stands for no board directory as in cpu, soc, vendor fields. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* boards.cfg: keep it sorted filling the board fieldMasahiro Yamada2014-07-14-155/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The boards.cfg file has allowed to use "-" for the board (= 6th) field if the board name is the same as the 7th field. But I notice one problem. Because tools/reformat.py sorts the lines in the simple alphabetical order (= the order of character code), some entries for the same board are not lined up together. For example, "bf527-ezkit" and "bf527-ezkit-v2" share the same board. But they are located separately because "bf527-ezkit" fills the board field with "-" whereas "bf527-ezkit-v2" specifies it explicitely. The similar things can be seen: - between "trizepsive" and "polaris" - between "RRvision" and "RRvision_LCD" - between "korat" and "korat_perm" - between "lwmon5" and "lcd4_lwmon5" This commit was generated by the following command: awk '$6 == "-" { $6 = $7 } { print }' boards.cfg \ | tools/reformat.py -i -d '-' -s 8 > boards0.cfg; \ mv boards0.cfg boards.cfg Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2014-07-11-2/+2
|\
| * i.MX6DL/S: add drive-strength back to pads DISP0_DAT2/DAT10Eric Nelson2014-07-10-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pad settings for DISP0_DATA02 and DISP0_DAT10 were not set in the same way as DISP0_DAT00-23, causing much flicker in parallel RGB displays on Dual-Lite and Solo processors. These settings now match the i.MX6 Dual and Quad core versions. Note that this fixes a regression in commit b47abc3 and that this is the second time we've had a regression on these two pads (See commit e654ddf). Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
* | usb: phy: omap_usb_phy: implement usb_phy_power() for AM437xFelipe Balbi2014-07-09-1/+21
| | | | | | | | | | | | | | | | Newer AM437x silicon requires us to explicitly power up the USB2 PHY. By implementing usb_phy_power() we can achieve that. Signed-off-by: Felipe Balbi <balbi@ti.com>
* | usb: host: xhci: make sure to power up PHYFelipe Balbi2014-07-09-0/+1
| | | | | | | | | | | | | | some boards won't work if the PHY isn't explicitly powered up. Signed-off-by: Felipe Balbi <balbi@ti.com>
* | doc: Add zynq fragment to git-mailrc fileMichal Simek2014-07-09-0/+1
| | | | | | | | | | | | | | | | | | | | This is a MIME GnuPG-signed message. If you see this text, it means that your E-mail or Usenet software does not support MIME signed messages. The Internet standard for MIME PGP messages, RFC 2015, was published in 1996. To open this message correctly you will need to install E-mail or Usenet software that supports modern Internet standards. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | ARM: OMAP4/5: Change omap4_sdp/panda and omap5_uevm maintainerLokesh Vutla2014-07-09-3/+3
| | | | | | | | | | | | | | Updating omap4_sdp/panda and omap5_uevm maintainer. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Acked-by: R Sricharan <r.sricharan@ti.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2014-07-09-30/+215
|\ \ | |/
| * mx6: soc: Update the comments of set_ldo_voltage()Fabio Estevam2014-07-09-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3d622b78 (mx6: soc: Introduce set_ldo_voltage()) introduces set_ldo_voltage() function that can be used to set the voltages of any of the three LDO regulators controlled by the PMU_REG_CORE register. Prior to this commit there was a single set_vddsoc() which only configured the VDDSOC regulator. Update the comments to align with the new set_ldo_voltage() implementation. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * MX6: Correct calculation of PLL_SYSAndre Renaud2014-07-09-1/+1
| | | | | | | | | | | | | | DIV_SELECT is used as Fout = Fin * div_select / 2.0, so we should do the shift after the multiply to avoid rounding errors Signed-off-by: Andre Renaud <andre@bluewatersys.com>
| * ARM: m53evk: Update default environmentLothar Rubusch2014-07-09-1/+86
| | | | | | | | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Lothar Rubusch <lothar@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
| * ARM: m53evk: Adjust mtdparts settingsMarek Vasut2014-07-09-9/+8
| | | | | | | | | | | | | | | | | | Adjust the mtdparts settings to allow for alternative boot images and for using UBI. Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefano Babic <sbabic@denx.de>
| * ARM: m53evk: add needed commands and optionsMarek Vasut2014-07-09-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | - "env ask", "env grep" and "setexpr" are needed for commissioning - add support for ext4 file systems - adjust default environment to use ext4 commands - add write support for (V)FAT and EXT4 - add bitmap and splashscreen support - print timestamp information for images Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Stefano Babic <sbabic@denx.de>
| * ARM: m28evk: Update default environmentLothar Rubusch2014-07-09-3/+84
| | | | | | | | | | Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Lothar Rubusch <lothar@denx.de>
| * ARM: m28evk: Adjust mtdpartsMarek Vasut2014-07-09-9/+8
| | | | | | | | | | | | Adjust the mtdparts to also consider factory-programmed config block. Signed-off-by: Marek Vasut <marex@denx.de>
| * ARM: m28evk: add needed commands and optionsMarek Vasut2014-07-09-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | - "env ask", "env grep" and "setexpr" are needed for commissioning - add support for ext4 file systems - adjust default environment to use ext4 commands - add write support for (V)FAT and EXT4 - add bitmap and splashscreen support - print timestamp information for images Signed-off-by: Marek Vasut <marex@denx.de> Cc: Stefano Babic <sbabic@denx.de>
* | Merge branch 'tom' of git://git.denx.de/u-boot-x86Tom Rini2014-07-07-3/+8
|\ \
| * | buildman: fix toolchain priority_listMasahiro Yamada2014-07-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | '-elf' appears twice in the toolchain priority_list. The second one is rudundant. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| * | buildman: fix to display warning message for missing [toolchain] sectionMasahiro Yamada2014-07-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toolchains.__init__ is expected to display a warning message when the [toolchain] section is missing from ~/.buildman file. But it never works. In that case, instead, buildmain fails with an error message which is difficult to understand: Traceback (most recent call last): File "tools/buildman/buildman", line 126, in <module> control.DoBuildman(options, args) File "/home/foo/u-boot/tools/buildman/control.py", line 78, in DoBuildman toolchains = toolchain.Toolchains() File "/home/foo/u-boot/tools/buildman/toolchain.py", line 106, in __init__ config_fname) NameError: global name 'config_fname' is not defined Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>