summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* Merge git://git.denx.de/u-boot-marvellTom Rini2015-11-17-1602/+175
|\
| * arm: kirkwood: ib62x0: drop duplicate defines from CONFIG_SYS_MVFSLuka Perkov2015-11-17-15/+0
| | | | | | | | | | | | These options were already defined in mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop dev CONFIG_OF_LIBFDTLuka Perkov2015-11-17-5/+0
| | | | | | | | | | | | It is already defined in included mv-common.h file. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: make use of defconfigLuka Perkov2015-11-17-3/+5
| | | | | | | | Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop CONFIG_CMD_ENV defineLuka Perkov2015-11-17-1/+0
| | | | | | | | | | | | The CONFIG_CMD_ENV is enabled by default so we can safely remove it. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: build u-boot.kwbLuka Perkov2015-11-17-0/+3
| | | | | | | | | | | | Avoid double typing in the shell and build u-boot.kwb when running "make" only. Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
| * arm: kirkwood: ib62x0: drop CONFIG_MACH_TYPELuka Perkov2015-11-17-5/+0
| | | | | | | | | | | | | | 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>
| * arm: kirkwood: Move common definitions into common fileQuentin Armitage2015-11-17-107/+70
| | | | | | | | | | | | | | | | 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>
| * arm: kirkwood: Remove duplicate definition from dreamplug.hQuentin Armitage2015-11-17-5/+0
| | | | | | | | | | | | CONFIG_DISPLAY_CPUINFO is already defined in mv-common.h Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: Align configuration filesQuentin Armitage2015-11-17-2/+5
| | | | | | | | | | | | | | 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>
| * arm: kirkwood: Use common definition for filesystemsQuentin Armitage2015-11-17-30/+20
| | | | | | | | | | | | | | 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>
| * arm: kirkwood: Move configuration of some commands to _defconfig filesQuentin Armitage2015-11-17-22/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * arm: kirkwood: Remove duplicate definition of CONFIG_CMD_FATQuentin Armitage2015-11-17-1/+0
| | | | | | | | | | | | include/configs/guruplug.h defined CONFIG_CMD_FAT twice. Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
| * arm: kirkwood: standardise the configurationQuentin Armitage2015-11-17-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * arm: mvebu: Fix SAR1_CPU_CORE_MASKDirk Eibach2015-11-17-5/+2
| | | | | | | | | | | | | | | | 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>
| * tools/kwbimage.c: Fix generation of binary headerStefan Roese2015-11-17-3/+9
| | | | | | | | | | | | | | | | | | | | | | 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>
| * arm: mvebu: a38x: serdes specification cleanupKevin Smith2015-11-17-54/+51
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * arm: mvebu: a38x: Add const to some function callsKevin Smith2015-11-17-7/+7
| | | | | | | | | | | | | | | | | | | | 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>
| * arm: mvebu: a38x: Remove unsupported topologiesKevin Smith2015-11-17-1392/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | board: axs10x switch serial port and Ethernet to driver modelAlexey Brodkin2015-11-18-39/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | arc: add empty asm/processor.h to satisfy compilation of USB codeAlexey Brodkin2015-11-18-0/+12
| | | | | | | | | | | | | | 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>
* | arc: add stubs for map_physmem() and unmap_physmem()Alexey Brodkin2015-11-18-0/+24
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Prepare v2016.01-rc1Tom Rini2015-11-16-3/+3
| | | | Signed-off-by: Tom Rini <trini@konsulko.com>
* tools/proftool: fix use-after-freeVincent Stehlé2015-11-16-2/+3
| | | | | | | | | | 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>
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-11-16-395/+1105
|\
| * arm: mx6: cm-fx6: add splash locations to cm-fx6Nikita Kiryanov2015-11-16-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * splash_source: add support for filesystem formatted sataNikita Kiryanov2015-11-16-0/+21
| | | | | | | | | | | | | | | | | | 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>
| * splash_source: add support for filesystem formatted usbNikita Kiryanov2015-11-16-1/+31
| | | | | | | | | | | | | | | | | | 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>
| * splash_source: add support for filesystem formatted mmcNikita Kiryanov2015-11-16-1/+72
| | | | | | | | | | | | | | | | | | 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>
| * splash_source: rename *_read() to *_read_raw()Nikita Kiryanov2015-11-16-9/+9
| | | | | | | | | | | | | | | | | | | | 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>
| * imx6: fix warnings due to switch to distro environmentStefano Babic2015-11-13-2/+2
| | | | | | | | | | | | | | | | | | | | wandboard and mx6cuboxi have warnings because BOOT_DELAY is defined twice. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Vagrant Cascadian <vagrant@debian.org> CC: Otavio Salvador <otavio@ossystems.com.br> CC: Fabio Estevam <fabio.estevam@freescale.com>
| * imx: mx7dsabresd: support lcdifPeng Fan2015-11-12-0/+81
| | | | | | | | | | | | | | | | | | | | | | Support LCDIF for mx7dsabresd board: 1. Add pinmux settings 2. Add VIDEO related macro definition and videomode env settings. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Adrian Alonso <aalonso@freescale.com>
| * imx: mx7: compile misc.c for mx7Peng Fan2015-11-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | Compile misc.c for mx7, since we need related function for lcdif and nand. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Sanchayan Maity <maitysanchayan@gmail.com> Cc: Stefan Agner <stefan@agner.ch> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * imx: imx-common: power down lcdif before boot osPeng Fan2015-11-12-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to call lcdif_power_down to make lcdif in initial state before kernel boot. Similar issue for uboot reset with lcdif enabled, system will hang after serveral times resetting. Need to let lcdif initial state to make all go well. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Eric Nelson <eric.nelson@boundarydevices.com> Cc: Nikita Kiryanov <nikita@compulab.co.il> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * imx: mx6: implement reset_miscPeng Fan2015-11-12-0/+7
| | | | | | | | | | | | | | | | We need to power down lcdif before uboot reset to make reset can pass stress test. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * video: mxsfb: introduce lcdif_power_downPeng Fan2015-11-12-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introudce a new function lcdif_power_down. 1. Waits for a VSYNC interrupt to guarantee the reset is done at the VSYNC edge, which somehow makes the LCDIF consume the display FIFO(?) and helps the LCDIF work normally at the kernel stage. 2. Add power down function to stop lcdif. The reason to introduce lcdif_power_down is that we want lcdif to be in initial state when doing uboot reset or before kernel boot to make system stable, otherwise system may hang. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
| * imx: mx6ul_14x14_evk: support lcdif displayPeng Fan2015-11-12-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | Support lcdif display: 1. Add pinmux and pad settings for LCDIF 2. Introduce setup_lcd to do the settings for LCDIF 3. Enable VIDEO related macros in board header files 4. Add a new env videomode which is needed by mxsfb.c. The settings for videomode in this patch is for TFT43AB. 5. Tested on mx6ul 14x14/9x9 evk. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: mx6: add clock api for lcdifPeng Fan2015-11-12-0/+247
| | | | | | | | | | | | | | | | | | Implement mxs_set_lcdclk, enable_lcdif_clock and enable_pll_video. The three API can be used to configure lcdif related clock when CONFIG_VIDEO_MXS enabled. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: mx6: crm_reg: add LCDIF related macrosPeng Fan2015-11-12-4/+30
| | | | | | | | | | | | | | | | | | Add i.MX6UL/SX LCDIF related macros. Discard uneccessary '#ifdef xxx'. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Reviewed-by: Stefano Babic <sbabic@denx.de>
| * imx: mx6: fix register addressPeng Fan2015-11-12-6/+12
| | | | | | | | | | | | | | | | | | | | | | 1. Move WDOG3_BASE_ADDR to '#if !(defined(__ASSEMBLY__))'. 2. Add i.MX6UL LCDIF register base address. And Introduce LCDIF1_BASE_ADDR to support runtime check. 3. include <asm/imx-common/regs-lcdif.h> for imx-regs.h to avoid building error for mxsfb.c, since mxsfb.c use imx-regs.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: lcdif: use one register structure for i.MXesPeng Fan2015-11-12-102/+22
| | | | | | | | | | | | | | | | | | Share one lcdif structure for i.MXes. 1. Discard struct mxs_lcdif_regs from imx-regs.h of i.MX7 2. Add i.MX6SX/6UL/7D support in imx-lcdif.h of imx-common Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: imx-common: move lcdif structure and macro definition to imx-commonPeng Fan2015-11-12-1/+1
| | | | | | | | | | | | | | | | Move 'struct mxs_lcdif_regs' and lcdif related macro definitions to arch/arm/include/asm/imx-common/regs-lcdif.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: include linux/types.h for regs-common.hPeng Fan2015-11-12-0/+2
| | | | | | | | | | | | | | | | There are uint8_t, uint32_t types in regs-common.h, so include linux/types.h. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * mxs: regs-common.h must be wrapped with !__ASSEMBLY__Peng Fan2015-11-12-1/+1
| | | | | | | | | | | | | | regs-common.h must be wrapped with #ifndef __ASSEMBLY__ Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de>
| * xfi3: correct function namePeng Fan2015-11-12-1/+1
| | | | | | | | | | | | | | | | board_mxsfb_system_setup must be renamed mxsfb_system_setup. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Stefano Babic <sbabic@denx.de>
| * mxs: add parameter base_addr for mxs_set_lcdclkPeng Fan2015-11-12-3/+3
| | | | | | | | | | | | | | | | | | | | | | Change mxs_set_lcdclk prototype to add a new parameter base_addr. There are two LCD interfaces for i.MX6SX, we may support LCDIF1 or LCDIF2. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Acked-by: Anatolij Gustschin <agust@denx.de>
| * arm: novena: Fix kernel_addr_r env variableMarek Vasut2015-11-12-1/+1
| | | | | | | | | | | | | | | | | | The kernel_addr_r should be set to the same value as CONFIG_LOADADDR, get rid of the duplication. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Sean Cross <xobs@kosagi.com> Cc: Stefano Babic <sbabic@denx.de>
| * imx: mx7: default enable non-secure modePeng Fan2015-11-12-0/+11
| | | | | | | | | | | | | | | | | | Support PSCI and switch to non-secure mode when booting linux. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Signed-off-by: Frank Li <Frank.Li@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * mx7: psci: add basic psci supportPeng Fan2015-11-12-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | 1. add basic psci support for imx7 chip. 2. support cpu_on and cpu_off. 3. switch to non-secure mode when boot linux kernel. 4. set csu allow accessing all peripherial register in non-secure mode. Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Fabio Estevam <fabio.estevam@freescale.com>
| * arm: discard relocation entries for secure textPeng Fan2015-11-12-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code such as PSCI in section named secure is bundled with u-boot image, and when bootm, the code will be copied to their runtime address same to compliation/linking address - CONFIG_ARMV7_SECURE_BASE. When compile the PSCI code and link it into the u-boot image, there will be relocation entries in .rel.dyn section for PSCI. Actually, we do not needs these relocation entries. If still keep the relocation entries in .rel.dyn section, r0 at line 103 and 106 in arch/arm/lib/relocate.S may be an invalid address which may not support read/write for one SoC. 102 /* relative fix: increase location by offset */ 103 add r0, r0, r4 104 ldr r1, [r0] 105 add r1, r1, r4 106 str r1, [r0] So discard them to avoid touching the relocation entry in arch/arm/lib/relocate.S. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Tom Warren <twarren@nvidia.com> Cc: York Sun <yorksun@freescale.com> Cc: Hans De Goede <hdegoede@redhat.com> Cc: Ian Campbell <ijc@hellion.org.uk> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Tom Rini <trini@konsulko.com> Cc: Jan Kiszka <jan.kiszka@siemens.com> Cc: Stefano Babic <sbabic@denx.de> Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
generated by cgit v1.1 at 2024-08-27 14:23:36 +0000