summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-02-10-146/+666
|\
| * pmic:pfuz100 add switch mode and more registersPeng Fan2015-02-10-0/+53
| | | | | | | | | | | | | | Add more pfuze register offset. And switch mode definition. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| * pmic:pfuze add macro for setting voltagePeng Fan2015-02-10-0/+2
| | | | | | | | | | | | | | "#define PFUZE100_SW1ABC_SETP(x) ((x - 3000) / 250)" This macro is for configuring SW1A/B/C Output Voltage easily. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| * arm, imx6, aristainetos: board updatesHeiko Schocher2015-01-29-74/+93
| | | | | | | | | | | | | | | | | | | | | | - use linux display timing settings - change backlight duty cycle 500ns - some defaultenvironment changes - change fit_addr_r to 0x14000000 as needed if MAX_LOCKDEP_SUBCLASSES in linux gets increased. - Environment now at 0xd0000 in nand flash Signed-off-by: Heiko Schocher <hs@denx.de>
| * common: convert compulab splash load code to common codeNikita Kiryanov2015-01-29-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move board/compulab/common/splash.c code to common/splash_source.c to make it available for everybody. This move renames cl_splash_screen_prepare() to splash_source_load(), and the compilation of this code is conditional on CONFIG_SPLASH_SOURCE. splash_source features: * Provide a standardized way for declaring board specific splash screen locations * Provide existing routines for auto loading the splash image from the locations as declared by the board * Introduce the "splashsource" environment variable, which makes it possible to select the splash image source. cm-t35 and cm-fx6 are updated to use the modified version. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Tom Rini <trini@ti.com> Cc: Igor Grinberg <grinberg@compulab.co.il> Cc: Anatolij Gustschin <agust@denx.de> Reviewed-by: Tom Rini <trini@ti.com> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: add splash screen supportNikita Kiryanov2015-01-29-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add support for splash screen. The splash screen is loaded from the SPI flash and is displayed on the HDMI display. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> [grinberg@compulab.co.il: minor code and commit message updates] Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: add support for usb keyboardNikita Kiryanov2015-01-29-0/+6
| | | | | | | | | | | | | | | | | | Add support for usb keyboard for cm_fx6. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: display compulab logoNikita Kiryanov2015-01-29-0/+3
| | | | | | | | | | | | | | | | | | Add compulab logo and display it on boot. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: add hdmi console supportNikita Kiryanov2015-01-29-0/+15
| | | | | | | | | | | | | | | | | | Add support for hdmi console. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: increase size of malloc areaNikita Kiryanov2015-01-29-1/+1
| | | | | | | | | | | | | | | | | | Increase size of malloc area to make room for framebuffer and other such big allocations. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il>
| * arm: mx6: cm-fx6: expand boot sequenceNikita Kiryanov2015-01-29-66/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | Expand boot sequence to the following order: 1) mmc boot: mmc boot script, then mmc bootm, then mmc bootz. 2) usb boot: usb boot script. 3) sata boot: sata boot script, sata bootm, sata bootz. 4) nand boot: nand bootm, then nand bootz. Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il> Cc: Stefano Babic <sbabic@denx.de> Cc: Igor Grinberg <grinberg@compulab.co.il> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
| * ot1200: add SPL configurationChristian Gmeiner2015-01-22-0/+10
| | | | | | | | | | | | | | We will only support loading u-boot.img from SPI flash stored at the offset of 64k. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * ot1200: make use of imx_ddr_size(..)Christian Gmeiner2015-01-22-1/+0
| | | | | | | | | | | | | | To support different ddr3 memory sizes we should start using imx_ddr_size(..) instead of the define PHYS_SDRAM_SIZE. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
| * imx: mx6: Change ENV offset to 512K bytes for larger u-boot imageYe.Li2015-01-22-2/+2
| | | | | | | | | | | | | | To align with other mx6 boards, change ENV offset from 384KB to 512KB position to fit a larger u-boot image. Signed-off-by: Ye.Li <B37916@freescale.com>
| * imx:mx6 add mx6sx in imx spl header filePeng Fan2015-01-22-0/+8
| | | | | | | | | | | | | | Since mx6sx's memory space is different to mx6dq, redefine the SPL related macro for mx6sx chip. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| * imx:mx6sxsabresd spl support in header filePeng Fan2015-01-22-0/+6
| | | | | | | | | | | | Add SPL support in mx6sxsabresd header file. Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
| * arm: mx6: Add Barco platinum-picon and platinum-titaniumStefan Roese2015-01-19-0/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the new Barco platinum platform. It currently includes those two boards: platinum-titanium ----------------- This is the same board as the titanium that is already supported in mainline U-Boot. But its now moved to this new platform to support multiple "flavors" of imx6 boards in one directory. Its also moved to support SPL booting. And with this we use the run-time DDR configuration of this SPL support. The board is equipped with the Micron MT41J128M16JT-125 DDR chips. We now can remove the DDR related registers tuples from the imximage.cfg file. As all this is done in the SPL at run-time. platinum-picon -------------- This board is new and based on the MX6DL with 1GiB DDR using the Micron MT41K256M16HA DDR3 chips. Its also equipped with 2 NAND chips (each 512MiB). Signed-off-by: Stefan Roese <sr@denx.de> Cc: Stefano Babic <sbabic@denx.de> Cc: Pieter Ronsijn <pieter.ronsijn@barco.com>
| * mx6sxsabresd: Remove unneeded board_late_init()Fabio Estevam2015-01-19-1/+0
| | | | | | | | | | | | | | | | Since commit 1f98e31bc0b2c37a ("imx: mx6sxsabresd: Use the pfuze common init function") board_late_init() became empty, so we can safely remove this unneeded function. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| * wandboard: Use 32bit color depth for Fusion LCDOtavio Salvador2015-01-19-1/+1
| | | | | | | | | | | | | | | | The Fusion LCD needs the 32bit color depth to properly work; the default is different on the 3.10.17 kernels and it is better to ensure it work out of box using proper default color setting. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* | Merge branch 'microblaze' of git://git.denx.de/u-boot-microblazeTom Rini2015-02-09-77/+25
|\ \
| * | microblaze: spl: Do not call mem_malloc_init and use early allocMichal Simek2015-02-09-21/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has some parts connected together: - Use _gd in bss section which is automatically cleared Location at SPL_MALLOC_END wasn't cleared at all - Use MALLOC_F_LEN(early alloc) instead of FULL MALLOC (mem_malloc_init is not called at all) - Simplify malloc and stack init. At the end of SPL addr is malloc area and below is stack Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | microblaze: Add support for CONFIG_SYS_MALLOC_F_LENMichal Simek2015-02-09-0/+1
| | | | | | | | | | | | | | | | | | | | | Create space for dm_init where calloc is called and malloc_base has to be initialized. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | microblaze: Move architecture to use generic board initMichal Simek2015-02-09-55/+9
| | | | | | | | | | | | | | | | | | | | | Compile code with -fPIC to get GOT. Do not build SPL with fPIC because it increasing SPL size for nothing. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | microblaze: Enable SPL_NOR support when FLASH_BASE is setupMichal Simek2015-02-09-2/+4
| | | | | | | | | | | | | | | | | | Simplify SPL NOR init. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| * | common: Move dram_init() declaration to common locationMichal Simek2015-02-09-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | Merge git://git.denx.de/u-boot-arcTom Rini2015-02-09-128/+0
|\ \ \
| * | | arc: move SYS_MONITOR_BASE setup in KonfigAlexey Brodkin2015-02-09-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Following SPARK ARC now has SYS_MONITOR_BASE setup via Kconfig. This makes "include/configs/*.h" cleaner and more flexible. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: hard-code CONFIG_ARCH_EARLY_INIT_R in asm/config.hAlexey Brodkin2015-02-09-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Common arch_early_init_r() is used in "arc/lib/cpu.c" for all ARC boards so there's no sense in separate per-board definitions. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: get rid of useless CONFIG_SKIP_LOWLEVEL_INITAlexey Brodkin2015-02-09-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's nothing related to really low-level init on ARC so CONFIG_SKIP_LOWLEVEL_INIT definition makes no sense. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: hard-code CONFIG_SYS_GENERIC_BOARD into asm/config.hAlexey Brodkin2015-02-09-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There're no other options for ARC except "generic board" so ther's no point to define CONFIG_SYS_GENERIC_BOARD per board. We now have it set fo all ARC boards. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: add selection of endianess in KconfigAlexey Brodkin2015-02-09-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to keep board description clean and minimalistic. This is especially helpful if one board may house different CPUs with different features. It is applicable to both FPGA-based boards or those that have CPUs mounted on interchnagable daughter-boards. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: select cache settings via menuconfigAlexey Brodkin2015-02-09-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows to keep board description clean and minimalistic. This is especially helpful if one board may house different CPUs with different features. It is applicable to both FPGA-based boards or those that have CPUs mounted on interchnagable daughter-boards. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: add more flavours of ARC700 series CPUAlexey Brodkin2015-02-09-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we may select a particular version of ARC700: * ARC750D or * ARC770D It allows more flexible (or more fine tuned) configuration of U-Boot. Before that change we relied on minimal configuration but now we may use specific features of each CPU. Moreover allows us to escape manual selection of options that exist in both CPUs but may have say different version like MMUv2 in ARC750D vs MMUv3 in ARC770D. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
| * | | arc: remove CPU hard-coded selection from board description in include/configsAlexey Brodkin2015-02-09-4/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | With switch to Kconfig we only need very board-specific descriptions in include/configs. CPU selection is performed with either defconfig or manually via menuconfig. Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
* | | Merge git://git.denx.de/u-boot-marvellTom Rini2015-02-06-1/+104
|\ \ \
| * | | arm: mvebu: maxbcm: Fix compilation warning and add Spansion SPI NOR supportStefan Roese2015-02-06-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compilation warning for maxbcm: Building maxbcm board... text data bss dec hex filename 160075 6596 38240 204911 3206f ./u-boot board/maxbcm/maxbcm.c: In function 'reset_phy': board/maxbcm/maxbcm.c:68:6: warning: unused variable 'reg' [-Wunused-variable] u16 reg; ^ board/maxbcm/maxbcm.c:66:6: warning: unused variable 'devadr' [-Wunused-variable] u16 devadr = CONFIG_PHY_BASE_ADDR; ^ Additionally support Spansion SPI NOR flash is added. With larger SPI device support via the CONFIG_SPI_FLASH_BAR define. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
| * | | arm: db-mv784mp-gp: Enable SPL to include DDR training code into U-BootStefan Roese2015-02-06-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds SPL support to the db-mv784mp-gp eval board. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
| * | | arm: maxbcm: Enable SPL to include DDR training code into U-BootStefan Roese2015-02-06-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds SPL support to the maxbcm MV78460 based board. Including the fixed DDR configuratrion needed for the DDR training code. And the the serdes PHY init code. Signed-off-by: Stefan Roese <sr@denx.de> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
| * | | kirkwood: sheevaplug: add FDT supportDrEagle2015-02-06-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LIBFDT feature is required to support new kernels. Signed-off-by: Gérald Kerma <drEagle@doukki.net> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
| * | | kirkwood: sheevaplug: fix multiple definesDrEagle2015-02-06-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Gérald Kerma <drEagle@doukki.net> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
| * | | kirkwood: sheevaplug: fix styleDrEagle2015-02-06-0/+1
| |/ / | | | | | | | | | | | | Signed-off-by: Gérald Kerma <drEagle@doukki.net> Reviewed-by: Luka Perkov <luka.perkov@sartura.hr>
* | | ARM: UniPhier: revive support card infoMasahiro Yamada2015-02-07-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0365ffcc0bd6 (generic-board: show model name in board_init_f() too), the support card information has not been displayed because check_support_card() is invoked only when show_board_info() fails to get the model name from Device Tree. This commit adds misc_init_f() function to call check_support_card() from there. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | ARM: UniPhier: move SPL init functions to spl_board_init()Masahiro Yamada2015-02-07-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Now init functions called from board_postclk_init() and dram_init() are only necessary for SPL. Move them to spl_board_init() for clean-up. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | ARM: UniPhier: move pin_init() to board_early_init_f()Masahiro Yamada2015-02-07-0/+1
| | | | | | | | | | | | | | | | | | | | | Currently, I/O pin settings are not necessary for SPL. The board_early_init_f() seems a suitable place to call pin_init(). Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | ARM: UniPhier: add environment variable to update images in NANDMasahiro Yamada2015-02-07-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To boot UniPhier boards with the NAND boot mode, two images (u-boot-spl.bin and u-boot-dtb.img) must be written at the correct offset addresses. TFTP downloading is useful to update such images in the NAND device. We generally do: => nand erase 0 0x100000 => tftpboot u-boot-spl.bin => nand write $loadaddr 0 0x10000 => tftpboot u-boot-dtb.img => nand write $loadaddr 0x10000 0xf0000 It is a tedious and error-prone operation. This commit provides the shorthand: => run nandupdate Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | ARM: UniPhier: use "&&" instead of "; " in commandsMasahiro Yamada2015-02-07-5/+5
|/ / | | | | | | | | | | Run the next command only when the previous one succeeded. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | Merge branch 'master' of git://git.denx.de/u-boot-ubiTom Rini2015-02-04-1/+260
|\ \
| * | ubifs: Import atomic_long operations from LinuxAnton Habegger2015-01-28-1/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a preperation for a subsequent UBIFS commit which needs atomic_long operations. Therefor "include/asm-generic/atomic-long.h" is imported from 1860e37 Linux 3.15 Signed-off-by: Anton Habegger <anton.habegger@gmail.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-tiTom Rini2015-02-02-4/+16
|\ \ \
| * | | OMAP3: igep00x0: Fix boot hang and add support for status LED.Enric Balletbo i Serra2015-01-29-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the STATUS_LED APIs for indicating a boot progress instead of show_boot_progress. This patch also fixes a problem introduced with commit b3f4ca1135 (dm: omap3: Move to driver model for GPIO and serial). After that commit the board doesn't boot. Looks like the problem is the gpio_request call inside the function show_boot_progress. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>