summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-18Allow fw env tools to be available as libraryStefano Babic
Sometimes it can be useful to link the fw_ tools instead of having the fw_setenv/fw_printenv installed. Patch exports the tool as library and allowes to link it with own programs. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Tom Rini <trini@konsulko.com> Reviewed-by: Tom Rini <trini@konsulko.com>
2015-11-18board: ti: beagle_x15: Rename to indicate support for TI am57xx evmsKipisz, Steven
BeagleBoard X15 (http://beagleboard.org/x15) support in u-boot does actually support two different platform configuration offered by TI. In addition to BeagleBoard X15, it also supports the TMDXEVM5728 (or more commonly known as AM5728-evm). Information about the TI AM57xx EVM can be found here http://www.ti.com/tool/tmdxevm5728 The EVM configuration is 1-1 compatible with BeagleBoard X15 with the additional support for mPCIe, mSATA, LCD, touchscreen, Camera, push button and TI's wlink8 offering. Hence, we rename the beagle_x15 directory to am57xx to support TI EVMs that use the AM57xx processor. By doing this we have common code reuse. This sets the stage to have a common u-boot image solution for multiple TI EVMs such as that already done for am335x and am437x. This sets the stage for upcoming multiple TI EVMs that share the same code base. NOTE: Commit eae7ae185335 ("am437x: Add am57xx_evm_defconfig using CONFIG_DM") introduced DT support for beagle_x15 under am57xx_evm platform name. However, this ignored the potential confusion arising for users as a result. To prevent this, existing beagle_x15_defconfig is renamed as am57xx_evm_nodt_defconfig to denote that this is the "non device tree" configuration for the same platform. We still retain am57xx-beagle-x15.dts at this point, since we just require the common minimum dts. As a result of this change, users should expect changes in build procedures('make am57xx_evm_nodt_defconfig' instead of 'make beagle_x15_defconfig'). Hopefully, this would be a one-time change. Signed-off-by: Steve Kipisz <s-kipisz2@ti.com> Signed-off-by: Schuyler Patton <spatton@ti.com> Acked-by: Nishanth Menon <nm@ti.com> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
2015-11-18tools/env: allow config filename to be passed via command line argumentMichael Heimpold
When for example generating/manipulating SD card/eMMC images which contain U-Boot and its environment(s), it is handy to use a given configuration file instead of the compiled-in default one. And since the default configuration file is expected under /etc it's hard for an usual linux user account without special permissions to use fw_printenv/fw_setenv for this purpose. So allow to pass an optional filename via a new '-c' command line argument. Example: $ ln -s fw_printenv tools/env/fw_setenv $ cat fw_env.config test.img 0x20000 0x20000 test.img 0x40000 0x20000 $ tools/env/fw_printenv -c ./fw_env.config fdt_file fdt_file=imx28-duckbill.dtb $ tools/env/fw_setenv -c ./fw_env.config fdt_file imx28-duckbill-spi.dtb $ tools/env/fw_printenv -c ./fw_env.config fdt_file fdt_file=imx28-duckbill-spi.dtb Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2015-11-18nios2: zap ioremapThomas Chou
Zap ioremap(), as it is replaced by map_physmem(,,MAP_NOCACHE). Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18nios2: dma-mapping.h: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_pio: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_qspi: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_tse: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_sysid: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_spi: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_timer: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_uart: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-18altera_jtag_uart: change ioremap to map_physmemThomas Chou
Change ioremap() to map_physmem(), as it is more used in u-boot. Signed-off-by: Thomas Chou <thomas@wytron.com.tw> Reviewed-by: Marek Vasut <marex@denx.de>
2015-11-17Merge git://git.denx.de/u-boot-marvellTom Rini
2015-11-17arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFSLuka Perkov
These options were already defined in mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDTLuka Perkov
It is already defined in included mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: ib62x0: make use of defconfigLuka Perkov
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV defineLuka Perkov
The CONFIG_CMD_ENV is enabled by default so we can safely remove it. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: ib62x0: build u-boot.kwbLuka Perkov
Avoid double typing in the shell and build u-boot.kwb when running "make" only. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPELuka Perkov
Mainline kernel for this device has only support for device tree. We can safely drop this legacy code. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: kirkwood: Move common definitions into common fileQuentin Armitage
Create include/configs/mv-plug-common.h for common definitions for Sheevaplug, Guruplug and Dreamplug. This will make it easier to ensure the built u-boots stay in track with each other Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: Remove duplicate definition from dreamplug.hQuentin Armitage
CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: Align configuration filesQuentin Armitage
Cosmetic: CONFIG_OF_LIBFDT was in a different position in the config file for the Dreamplug, compared to the Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: Use common definition for filesystemsQuentin Armitage
include/configs/mv-common.h brings in the required filesystems if CONFIG_SYS_MVFS is defined, so use it for Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: Move configuration of some commands to _defconfig filesQuentin Armitage
For Marvell plugs, move the configuration of DHCP, NAND/SF, PING and USB commands, and HUSH_PARSER into the _defconfig file, rather than the include/configs/*plug.h files. This avoids compiler warnings of duplicate definitions if the option is selected in the .config, but also defined in the include/configs/*plug.h file. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FATQuentin Armitage
include/configs/guruplug.h defined CONFIG_CMD_FAT twice. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: kirkwood: standardise the configurationQuentin Armitage
The Marvell plugs are very similar systems, and so it makes sense for their u-boots to have the same commands/configuration. Add EXT4 and MII to Dreamplug, DATE to Guruplug and Sheevaplug. Add CONFIG_SYS_ALT_MEMTEST to Sheevaplug. There are still command differences around NAND, SPI/NOR. Also default to building u-boot.kwb for Sheevaplug and Guruplug. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
2015-11-17arm: mvebu: Fix SAR1_CPU_CORE_MASKDirk Eibach
SAR1_CPU_CORE_MASK was wrong, probably copy/paste from another architecture. Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc> Reviewed-by: Stefan Roese <sr@denx.de>
2015-11-17tools/kwbimage.c: Fix generation of binary headerStefan Roese
The binary header ends with one lword, defining if another header follows this one. This additions 4 bytes need to be taken into account in the generation of the header size. And the complete 4 bytes at the end of this binary header need to get cleared. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr> Cc: Kevin Smith <kevin.smith@elecsyscorp.com>
2015-11-17arm: mvebu: a38x: serdes specification cleanupKevin Smith
Instead of allocating space in the driver for the serdes specification table, just allow the board file to set a pointer to it. Also, allow the board to only specify the lanes that are used instead of including unused lanes. Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com> Acked-by: Stefan Roese <sr@denx.de> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: mvebu: a38x: Add const to some function callsKevin Smith
Functions that do not modify the pointer passed should declare it as const. Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com> Acked-by: Stefan Roese <sr@denx.de> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17arm: mvebu: a38x: Remove unsupported topologiesKevin Smith
A lot of extra configuration information was left over in the Marvell serdes and DDR3 initialization code for boards that U-boot does not support. Remove this extra config information, and the concept of fixing up board topologies with information loaded from an EEPROM. If this needs to be done, it should be handled in the board file, not in core code. Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com> Acked-by: Stefan Roese <sr@denx.de> Cc: Dirk Eibach <eibach@gdsys.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
2015-11-17board: axs10x switch serial port and Ethernet to driver modelAlexey Brodkin
With this change Synopsys DesignWare SDP board is switched to driver model for both serial port (serial_dw) and Ethernet (Designware GMAC). This simplifies include/configs/axs101.h and allows for reuse of Linux's Device Tree description. For simplicity Linux's .dts files are not blindly copied but only very few extracts of them are really used (those that are supported in U-Boot at the moment). Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
2015-11-17arc: add empty asm/processor.h to satisfy compilation of USB codeAlexey Brodkin
common/usb.c unconditionally includes <asm/processor.h> And now to allow USB support on ARC boards we have to have that header. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
2015-11-17arc: add stubs for map_physmem() and unmap_physmem()Alexey Brodkin
Up until now there was no need in those stubs. But since following commit compilation of U-Boot on ARC is broken: ------------------------>8---------------------- commit 7861204c9af7fec1ea9b41541c272516235a6c93 Author: Stephen Warren <swarren@wwwdotorg.org> Date: Sat Oct 3 13:56:46 2015 -0600 itest: make memory access work under sandbox itest accesses memory, and hence must map/unmap it. Without doing so, it accesses invalid addresses and crashes. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org> Reviewed-by: Simon Glass <sjg@chromium.org> ------------------------>8---------------------- That's because CMD_ITEST is enabled by default in common/Kconfig and now map_physmem()/unmap_physmem() is used there. So this patch adds missing stubs for ARC. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> Reviewed-by: Simon Glass <sjg@chromium.org> Cc: Stephen Warren <swarren@wwwdotorg.org>
2015-11-17Prepare v2016.01-rc1Tom Rini
Signed-off-by: Tom Rini <trini@konsulko.com>
2015-11-16tools/proftool: fix use-after-freeVincent Stehlé
The read_trace_config() can dereference the line pointer after freeing it on its error path. Avoid that. This was found by Coverity Scan. Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com> Cc: Simon Glass <sjg@chromium.org>
2015-11-16Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini
2015-11-16arm: mx6: cm-fx6: add splash locations to cm-fx6Nikita Kiryanov
Add the following splash locations to cm-fx6: * filesystem formatted mmc * filesystem formatted usb * filesystem formatted sata Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-11-16splash_source: add support for filesystem formatted sataNikita Kiryanov
Add support for loading splashimage from filesystem formatted sata storage. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
2015-11-16splash_source: add support for filesystem formatted usbNikita Kiryanov
Add support for loading splash image from USB drive formatted with a filesystem. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
2015-11-16splash_source: add support for filesystem formatted mmcNikita Kiryanov
Add support for loading splash image from an SD card formatted with a filesystem. Update boards to maintain original behavior where needed. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
2015-11-16splash_source: rename *_read() to *_read_raw()Nikita Kiryanov
Rename raw read functions to *_read_raw() in preparation for supporting read_fs() feature. Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Tom Rini <trini@konsulko.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
2015-11-13Merge branch 'series1_v2' of git://git.denx.de/u-boot-sparcTom Rini
2015-11-13Merge branch 'master' of git://git.denx.de/u-boot-x86Tom Rini
2015-11-13sf: Fix NULL pointer exception for flashes without lock methodsBin Meng
commit c3c016c "sf: Add SPI NOR protection mechanism" introduced flash_lock()/flash_unlock()/flash_is_locked() methods for SPI flash, but not every flash driver supplies these. We should test these methods against NULL before actually calling them. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
2015-11-13x86: Remove CONFIG_SYS_EARLY_PCI_INITBin Meng
CONFIG_SYS_EARLY_PCI_INIT is not needed any more since with driver model, PCI enumeration is automatically triggered. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-11-13x86: Remove legacy pci codesBin Meng
Now that we have converted all x86 boards to use driver model pci, remove these legacy pci codes. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-11-13x86: crownbay: Remove unused PCI region address macrosBin Meng
These are leftover when converted to use driver model pci. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
2015-11-13x86: qemu: Convert to use driver model ethBin Meng
Move to driver model for ETH (e1000) on QEMU. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>