aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-03-05Merge git://git.denx.de/u-boot-socfpgaTom Rini
2015-03-05Merge git://git.denx.de/u-boot-marvellTom Rini
2015-03-05Merge branch 'master' of git://git.denx.de/u-boot-mpc85xxTom Rini
2015-03-05fixdep: remove multiple .config support codeMasahiro Yamada
Since commit e02ee2548afe (kconfig: switch to single .config configuration), the ".*.cmd" files are not correctly created for SPL/TPL. The U-Boot extension code in fixdep, which was introduced to support the multiple .config, must be removed. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2015-03-05stdio: extend "name" to 32 symbolsAlexey Brodkin
With limit of 16 symbols very simple device names derived drom device tree description could not be displayed correctly. For example "serial0@0xc0fc1000" will be truncated to sensless "serial0@0xc0fc10" - note dropped tariling zeros. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2015-03-05cmd_usb_mass_storage: Remove extra 'ums' string in the usage textFabio Estevam
Currently the usage text for the 'ums' command looks like this: Usage: ums ums <USB_controller> [<devtype>] <devnum> e.g. ums 0 mmc 0 ,so remove the extra 'ums' in the text. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br> Acked-by: Marek Vasut <marex@denx.de>
2015-03-05common/board_f: implement type casting for gd structureAlexey Brodkin
In case of global data structure defined as "register volatile" compiler throws an warning about incorrect type used: --->8--- common/board_f.c: In function "board_init_f_r": common/board_f.c:1073:2: warning: passing argument 1 of "&board_init_r +(sizetype)gd->reloc_off" discards "volatile" qualifier from pointer target type [enabled by default] (board_init_r + gd->reloc_off)(gd, gd->relocaddr); ^ common/board_f.c:1073:2: note: expected "struct gd_t *" but argument is of type "volatile struct gd_t *" --->8--- An obvious fix is manual casting to "gd_t *". Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-03-05lib/asm-offsets - make GD_RELOCADDR, GD_RELOC_OFF & GD_START_ADDR_SP ↵Alexey Brodkin
available for all architectures GD_RELOCADDR, GD_RELOC_OFF & GD_START_ADDR_SP are generic members of global data structure so why don't we allow architectures other than ARM to use it. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-03-05spl: fix calling "spl export .." more than onceHeiko Schocher
running "spl export ..." more than once fails with: Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order Trying to execute a command out of order ERROR prep subcommand failed! Subcommand failed reason is commmit: 35fc84fa1f: Refactor the bootm command to reduce code duplication It used "state != BOOTM_STATE_START" but state is a bitfield, so check if the bit BOOTM_STATE_START is not set. With this fix, "spl export ..." can called more than once ... Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Simon Glass <sjg@chromium.org>
2015-03-05vexpress64: juno: add NOR flash detectionLinus Walleij
This enables the vexpress64 to detect its NOR flash so that we can load kernel etc from it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-03-05use ASM_NL instead of '; ' for assembler new line character in the macroChen Gang
For some assemblers, they use another character as newline in a macro (e.g. arc uses '`'), so for generic assembly code, need use ASM_NL (a macro) instead of ';' for it. Basically this is the same patch as applied to Linux kernel - http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/include/linux/linkage.h?id=9df62f054406992ce41ec4558fca6a0fa56fffeb but modified a bit to fit in U-Boot. Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com> Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@ti.com>
2015-03-05omap: gpmc: 'nandecc sw' can use HAM1 or BCH8Ash Charles
The 'nandecc sw' command selects a software-based error correction algorithm. By default, this is OMAP_ECC_HAM1_CODE_SW but some platforms use OMAP_ECC_BCH8_CODE_HW_DETECTION_SW as their software-based correction algorithm. Allow a user to be specific e.g. # nandecc sw <hamming|bch8> where 'hamming' is still the default. Note: we don't just use CONFIG_NAND_OMAP_ECCSCHEME as it might be set to a hardware-based ECC scheme---a little strange when the user has requested 'sw' ECC. Signed-off-by: Ash Charles <ashcharles@gmail.com>
2015-03-05mtd: nand: omap_gpmc: Make ready/busy pins configurableMichal Sojka
Commit fb384c4720ca7496775d6578f184bf628db73456 introduced the use of WAIT0 pin for determining whether the NAND is ready or not. This only works if all NAND chips are connected to WAIT0. If some chips are connected to the other available pin WAIT1, nand_wait() does not really wait and prints a WARN_ON message. This patch allows the board to provide configuration of which chip is connected to which WAITx signal. For example, one can define in include/configs/foo.h: #define CONFIG_NAND_OMAP_GPMC_WSCFG 0,0,1,1 This would mean that chips using to CS0 and 1 are connected to WAIT0 and chips with CS2 and 3 are connected to WAIT1. Signed-off-by: Michal Sojka <sojka@merica.cz> Acked-by: Stefan Roese <sr@denx.de> Tested-by: Michal Vokáč <michal.vokac@comap.cz> Cc: Tom Rini <trini@ti.com>
2015-03-05fs: ext4 write: return file len on successPrzemyslaw Marczak
After rework of the file system API, the size of ext4 write was missed. This causes printing unreliable write size at the end of the file system write operation. Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com> Cc: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Simon Glass <sjg@chromium.org> Tested-by: Stephen Warren <swarren@nvidia.com>
2015-03-05vexpress64: juno: support SMC9118 ethernetLinus Walleij
This configures the Juno board to enable ethernet using the SMSC9118 ethernet controller found in the board. Tested by TFTP-booting a kernel over ethernet. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2015-03-05m68k: Add generic board support for MCF547X/8X and MCF5445XAlison Wang
This patch adds generic board support for MCF547X/8X and MCF5445X. It is based on the patch about common generic board support for M68K architecture sent by Angelo. Signed-off-by: Alison Wang <alison.wang@freescale.com>
2015-03-05m68k: add generic-board supportangelo@sysam.it
Add generic-board support for the m68k architecture. Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2015-03-05m68k: add mcf5307 cpu supportangelo@sysam.it
Add Freescale MCF5307 cpu support. Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2015-03-05m68k: add amcore board supportangelo@sysam.it
Add Sysam Amcore m68k-based board support. Signed-off-by: Angelo Dureghello <angelo@sysam.it>
2015-03-05Adding Support for BAV335x boardsGilles Gameiro
2015-03-05omap3: add support for QUIPOS Cairo board.Albert ARIBAUD \(3ADEV\)
This patch extends OMAP3 support for AM/DM37xx and introduces the AM3703-based Quipos Cairo board. Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> Reviewed-by: Simon Glass <sjg@chromium.org>
2015-03-05cmd_yaffs: Clean up command usage messagesPeter Tyser
Remove duplicate command names in usage messages to fix issues such as: => help yls yls - yaffs ls Usage: yls yls [-l] dirname Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
2015-03-05board/BuR/kwb: Support modify bootcmd through reset-controllerHannes Petermaier
For some cases it is necessary to modify temporaly the bootcommand. This can be done by writing into the Scratchregister a specific value: * 0xCC - modify bootcmd "run netboot" * 0xCD - modify bootcmd "run netscript" * 0xCE - modify bootcmd "run mmcboot" the environment in flash is NOT overwritten. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/kwb: Form a bootline for vxWorksHannes Petermaier
vxWorks needs several parameters which are set by the bootloader und his environment. So we form a vxWorks bootline and pass the result to vxWorks on a predefined address. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/kwb: Redesign default-environmentHannes Petermaier
Due to several changes in the boot-process we do a complete redesign of the default environment. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/kwb: Support booting LinuxHannes Petermaier
For series testing purpose we need to boot some linux, therefore we enable the needed features - bootz - devicetree Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/kwb: switch to board HW-Rev3Hannes Petermaier
The board has been redesigned, therefore we need from now other I/O Pins to mux and handle. Older boards aren't supported from now anymore. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: cosmetic changesHannes Petermaier
remove unnary '#define ETHLED_ORANGE (96+16) /* GPIO3_16 */' Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Rework default-environment settings.Hannes Petermaier
Due to several changes of the boot-process we've redesigned the default- environment settings completly. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/common: Add support for displaying BMP on LCDHannes Petermaier
Customer wants to display some logo very quickly after power on, so we support from now loading a compressed bmp.gz to the screen. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/common: Enable CONFIG_CMD_TIMEHannes Petermaier
time measurement of u-boot commands is needed very often during development. We add this feature until development is completed. Maybe forever :) Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/common: Introduce Network Console and common environment for itHannes Petermaier
It is often necessary to "break in" into boards bootloader commandline if something fails or even for development purposes some parameters have to be changed. So we enable u-boot's CONFIG_NETCONSOLE feature. We also modify Networksettings to apply with this new use-case. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Chg Pinmux - enable UART1 pinsHannes Petermaier
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Chg pinmux - use free NAND Pins in non NAND-config as GPIOHannes Petermaier
On boards were we have no NAND-flash soldered, we want to use those free pins as regular gpio. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Change pinmux for GPIO2_28 from GPIO to PWM-TimeroutputHannes Petermaier
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Enable EXT4 supportHannes Petermaier
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Enable U-Boot BOOTCOUNT featureHannes Petermaier
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/tseries: Enable HW-WatchdogHannes Petermaier
Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/common: try to setup cpsw mac-address from the devicetreeHannes Petermaier
since we have a dtb blob programmed on the board we try to setup the cpsw interface with the programmed mac. If this method fails, we fall back to the device-fuses. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05board/BuR/common: Take usage of am335x LCD-DisplayHannes Petermaier
a summary screen to the lcd. Values are taken from environment and or devicetree blob. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05common/lcd: Add command for writing to lcd-displayHannes Petermaier
Sometimes we do not want redirect u-boot's console to screen but anyway we want write out some status information out of a u-boot script to the display. So we cannot use the normal "echo ....", instead we write explicitly using "lcdputs ..." for writing to the actual cursor position on LCD. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05common/lcd: Add command for setting cursor within lcd-consoleHannes Petermaier
Sometimes we do not want redirect u-boot's console to screen but anyway we want write out some status information out of a u-boot script to the display. To define the specific position of the string to be written, we have to set the cursor with "setcurs" before writing. Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05drivers/video/am335x-fb: Add possibility to wait for stable power/pictureHannes Petermaier
Often on boards exists a circuit which switches power on/off to LCD display. Due to the need of limiting the in-rush current the output voltage from this circuit rises "slowly", so it is necessary to wait a bit (VCC ramp up time) before starting output on LCD-pins. This time is specified in <n> ms within the panel-settings, called "pup_delay" Further some LCDs need a couple of frames to stabilize the image on it. We have now the possibility to wait some time after starting output on LCD. This time is also specified in <n> ms within panel-settings, called "pon_delay" Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
2015-03-05arm: spear: Move to generic board supportStefan Roese
Without this change the board support for these SPEAr boards would be dropped soon. Generic board support seems to work just fine. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Vipin Kumar <vk.vipin@gmail.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
2015-03-05dreamplug: set CONFIG_BUILD_TARGET to build u-boot.kwbIan Campbell
Saves having to remember to ask make for it explicitly. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
2015-03-05dreamplug: switch to GENERIC_BOARDIan Campbell
Built and booted to a Linux prompt with no issues discovered. network and usb access to the external mmc are ok. (my internal mmc is knackered at the h/w level). Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
2015-03-05kwbimage: align v1 binary header to 4BChris Packham
According to the Armada-XP documentation the binary header format requires the header length to be aligned to 4B. Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
2015-03-05arm: aspenite: convert to generic boardAjay Bhargav
Enable CONFIG_SYS_GENERIC_BOARD for Marvell Aspenite. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Luka Perkov <luka.perkov@sartura.hr>
2015-03-05arm: gplugd: convert to generic boardAjay Bhargav
Enable CONFIG_SYS_GENERIC_BOARD for Marvell gplugD. Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Acked-by: Luka Perkov <luka.perkov@sartura.hr>
2015-03-05arm: socfpga: Enable DM and DM_SPIMarek Vasut
Enable DM and DM_SPI support for both Cyclone 5 and Arria 5 boards, since they use drivers which require those. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@opensource.altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Pavel Machek <pavel@denx.de> Acked-by: Simon Glass <sjg@chromium.org> Acked-by: Stefan Roese <sr@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Vince Bridgers <vbridger@opensource.altera.com>