summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge git://git.denx.de/u-boot-x86Tom Rini2015-07-15-27/+39
|\
| * pci: Configure expansion ROM during auto config processBin Meng2015-07-14-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently PCI expansion ROM address is assigned by a call to pciauto_setup_rom() outside of the pci auto config process. This does not work when expansion ROM is on a device behind PCI bridge where bridge's memory limit register was already programmed to a value that does not cover the newly assigned expansion ROM address. To fix this, we should configure the ROM address during the auto config process. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
| * dm: x86: baytrail: Correct PCI region 3 when driver model is usedSimon Glass2015-07-14-0/+1
| | | | | | | | | | | | | | | | Commit afbbd413a fixed this for non-driver-model. Make sure that the driver model code handles this also. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
| * dm: x86: minnowmax: Move PCI to use driver modelSimon Glass2015-07-14-0/+1
| | | | | | | | | | | | | | | | | | Adjust minnowmax to use driver model for PCI. This requires adding a device tree node to specify the ranges, removing the board-specific PCI code and ensuring that the host bridge is configured. Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Simon Glass <sjg@chromium.org>
| * dm: spi: Enable environment for minnowmaxSimon Glass2015-07-14-3/+2
| | | | | | | | | | | | | | | | Enable a SPI environment and store it in a suitable place. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
| * x86: Configure VESA parameters before loading Linux kernelBin Meng2015-07-14-2/+2
| | | | | | | | | | | | | | | | | | Store VESA parameters to Linux setup header so that vesafb driver in the kernel could work. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Jian Luo <jian.luo4@boschrexroth.de>
| * x86: crownbay: Enable graphics supportBin Meng2015-07-14-7/+7
| | | | | | | | | | | | | | | | | | | | | | Enable graphics support on Intel Crown Bay board With the help of vgabios for Intel TunnelCreek IGD. Tested with an external LVDS panel connected to X4 connector and SDVO adapter connected to X9 connector on the board. Signed-off-by: Jian Luo <jian.luo4@boschrexroth.de> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
| * x86: Move VGA option rom macros to KconfigBin Meng2015-07-14-6/+0
| | | | | | | | | | | | | | | | | | | | Move X86_OPTION_ROM_FILE & X86_OPTION_ROM_ADDR to arch/x86/Kconfig and rename them to VGA_BIOS_FILE & VGA_BIOS_ADDR which depend on HAVE_VGA_BIOS. The new names are consistent with other x86 binary blob options like HAVE_FSP/FSP_FILE/FSP_ADDR. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
| * dm: pci: Use the correct hose when configuring devicesSimon Glass2015-07-14-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Only the PCI controller has access to the PCI region information. Make sure to use the controller (rather than any attached bridges) when configuring devices. This corrects a failure to scan and configure devices when driver model is enabled for PCI. Also add a comment to explain the problem. Signed-off-by: Simon Glass <sjg@chromium.org>
| * dm: cpu: Add a new get_count method to cpu uclassBin Meng2015-07-14-0/+16
| | | | | | | | | | | | | | | | Introduce a new method 'get_count' in the UCLASS_CPU ops to get the number of CPUs in the system. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
* | Merge branch 'master' of git://git.denx.de/u-boot-spiTom Rini2015-07-14-3/+18
|\ \ | |/ |/|
| * stv0991: enable cadence qspi controller & spi flashVikas Manocha2015-07-03-0/+15
| | | | | | | | | | | | | | | | This patch does all the board configurations required to use the qspi controller & attached spi flash memory. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Jagannadh Teki <jteki@openedev.com>
| * stv0991: remove define CONFIG_OF_SEPARATE from board fileVikas Manocha2015-07-03-1/+0
| | | | | | | | | | | | | | | | CONFIG_OF_SEPARATE is default define with CONFIG_OF_CONTROL, removing this define from the board file to avoid multiple definition warning. Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Jagannadh Teki <jteki@openedev.com>
| * stv0991: move OF_CONTROL config to defconfigVikas Manocha2015-07-03-1/+0
| | | | | | | | | | Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Jagannadh Teki <jteki@openedev.com>
| * stv0991: enable saving enrironment in spi flashVikas Manocha2015-07-03-1/+3
| | | | | | | | | | Signed-off-by: Vikas Manocha <vikas.manocha@st.com> Reviewed-by: Jagannadh Teki <jteki@openedev.com>
* | Merge git://git.denx.de/u-boot-marvellTom Rini2015-07-10-0/+41
|\ \
| * | arm: mvebu: db-88f6820-gp: Add USB/EHCI supportStefan Roese2015-07-10-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enabled the USB/EHCI support for the Marvell DB-88F6820-GP eval board. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Marek Vasut <marex@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
| * | arm: mvebu: db-88f6820-gp.h: Add SATA/SCSI (AHCI) supportStefan Roese2015-07-10-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Configure and enable the SATA/SCSI (AHCI) support for the Marvell DB-88F6820-GP eval board. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
| * | arm: mvebu: Add SATA/SCSI (AHCI) support for Armada A38xStefan Roese2015-07-10-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the common AHCI controller on the Marvell Armada 38x. Tested on the Marvell DB-88F6820-GP eval board. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr>
| * | arm: mvebu: db-88f6820-gp: Add MMC/SDIO supportStefan Roese2015-07-10-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds MMC/SDIO support to the Marvell DB-88F6820-GP board configuration. Including support for the common partitions and filesystems. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Pantelis Antoniou <panto@antoniou-consulting.com> Cc: Luka Perkov <luka.perkov@sartura.hr>
* | | mtd: fix false positive "Offset exceeds device limit" errorMasahiro Yamada2015-07-10-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 09c3280754f8 (mtd, nand: Move common functions from cmd_nand.c to common place), NAND commands would not work at all on large devices. => nand read 80000000 10000 10000 NAND read: Offset exceeds device limit => nand erase 100000 100000 NAND erase: Offset exceeds device limit The type of the "size" of "struct mtd_info" is uint64_t, while mtd_arg_off_size() and mtd_arg_off() treat chipsize as int type. The chipsize is wrapped around if the argument is given with 2GB or larger. Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Scott Wood <scottwood@freescale.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
* | | ahci: Fix compiling warnings under 64bit platformsTang Yuantian2015-07-09-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compling under 64bit platforms, there are lots of warnings, like: drivers/block/ahci.c:114:18: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] u8 *port_mmio = (u8 *)probe_ent->port[port].port_mmio; ^ drivers/block/ahci.c: In function ?.hci_host_init?. drivers/block/ahci.c:218:49: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] probe_ent->port[i].port_mmio = ahci_port_base((u32) mmio, i); ...... Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com> Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
* | | arm: baltos: change USB ports functionsYegor Yefremov2015-07-09-2/+2
| | | | | | | | | | | | | | | | | | | | | Baltos has USB0 connected to a USB hub and thus is host-only. USB1 is connected to microUSB connector and thus should use OTG mode. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
* | | keystone2: config: update default mtdMichael Scherban2015-07-08-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Because it is possible for the MTD number to change, causing a filesystem mount failure, we should use the volume name instead of the MTD number and let Linux resolve the correct one. Signed-off-by: Mike Scherban <m-scherban@ti.com>
* | | stm32f4: fix gpio description in commentAntonio Borneo2015-07-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On STM32F429 gpio PC6/PC7 can be allocated for USART6, as reported in the comment. But current code in drivers/serial/serial_stm32.c uses a different gpio mapping (PG14/PG9) for USART6. Fix the comment to match current code in the driver. Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> To: u-boot@lists.denx.de To: Kamil Lulko <rev13@wp.pl> Cc: Tom Rini <trini@konsulko.com>
* | | stm32f4: fix minor typo in commentAntonio Borneo2015-07-08-1/+1
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> To: u-boot@lists.denx.de To: Kamil Lulko <rev13@wp.pl> Cc: Tom Rini <trini@konsulko.com>
* | | siemens,am33x: adjust mtd partitionEgli, Samuel2015-07-08-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use one mtd partition for rootfs and configuration by means of ubi volumes and get rid of configuration partition. We can use partition layout for both 256MB and 512MB flash. Signed-off-by: Samuel Egli <samuel.egli@siemens.com> Cc: Heiko Schocher <hs@denx.de> Cc: Roger Meier <r.meier@siemens.com> Reviewed-by: Tom Rini <trini@konsulko.com> Acked-by: Heiko Schocher <hs@denx.de>
* | | arm: baltos: fix NAND bootYegor Yefremov2015-07-08-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | Specify proper U-Boot offset, enable prefetch mode, increase bootm size and add FIT fallback, if board_name is not present in kernel-fit.itb image. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
* | | arm: baltos: drop I2C speed to 1000 HzYegor Yefremov2015-07-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This action is need to make I2C communication with PMIC stable for low temperature. Print current I2C speed in SPL for visual control. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
* | | arm: baltos: enable CMD_NET and FIT support in defconfigYegor Yefremov2015-07-08-2/+0
| | | | | | | | | | | | | | | Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
* | | arm: convert am3517_crane and am3517_evm to generic boardsYegor Yefremov2015-07-08-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG_SYS_GENERIC_BOARD to board's config header. Boot-tested on am3517_evm board. Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
* | | ti: Add SPDX license identifier to omap.hSimon Glass2015-07-08-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also came from Linux - according to this thread it has a GPL v2 license like arch/arm/mach-omap2/mux.h: http://lists.denx.de/pipermail/u-boot/2015-June/217827.html Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: Ingrid Viitanen <ingrid.viitanen@nokia.com> Reviewed-by: Tom Rini <trini@konsulko.com>
* | | Allow CONFIG_REGEX to be disabled when CONFIG_NETJoe Hershberger2015-07-08-1/+3
|/ / | | | | | | | | | | | | | | | | | | | | Instead of selecting REGEX when NET is enabled, make it the default, but allow boards that are tiny to disable it and lose functionality on all but the first Ethernet adapter. cm-bf548, bf538f-ezkit, and bf533-stamp need this. None appear to have more than one Ethernet interface. Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
* | Merge branch 'master' of git://www.denx.de/git/u-boot-imxTom Rini2015-07-03-10/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | Conflicts: configs/tbs2910_defconfig configs/tqma6q_mba6_mmc_defconfig configs/tqma6q_mba6_spi_defconfig configs/tqma6s_mba6_mmc_defconfig configs/tqma6s_mba6_spi_defconfig include/configs/mx6_common.h Signed-off-by: Tom Rini <trini@konsulko.com>
| * colibri_vf: Increase console IO buffer size to 1024Sanchayan Maity2015-07-03-1/+1
| | | | | | | | | | | | | | | | Increase console IO buffer size to 1024 from the previous value of 256. The previous value was too short for editing environment variables like ubiboot from the console. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
| * mx6cuboxi: drop options that are duplicated in mx6_commonPeter Robinson2015-06-27-8/+0
| | | | | | | | | | | | | | These options were merged into mx6_common and were seemingly missed in mx6cuboxi so drop the duplicates Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
| * Drop duplicate CONFIG_SYS_NO_FLASH from mx6_commonPeter Robinson2015-06-27-1/+0
| | | | | | | | | | | | It's defind earlier in the file Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
| * arm: imx6: tqma6: add kconfig to board headerMarkus Niebel2015-06-27-0/+1
| | | | | | | | | | | | | | this is needed later to have Kconfig generated stuff as define. Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
| * Merge branch 'master' of git://git.denx.de/u-bootStefano Babic2015-06-15-979/+77
| |\
| * | tbs2910: add PRE_CONSOLE_BUFFER supportSoeren Moch2015-06-09-0/+4
| | | | | | | | | | | | | | | | | | Add PRE_CONSOLE_BUFFER support to display early boot messages over HDMI. Signed-off-by: Soeren Moch <smoch@web.de>
| * | tbs2910: add thermal supportSoeren Moch2015-06-09-0/+2
| | | | | | | | | | | | Signed-off-by: Soeren Moch <smoch@web.de>
| * | imx6: novena: Reinstate missing CONFIG_FAT_WRITEMarek Vasut2015-06-09-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit a380ce6e9698257c4e8be4c0711b09c90a8febff removed CONFIG_FAT_WRITE from novena.h , so Novena lost ability to write FAT partitions. Add this functionality back. Signed-off-by: Marek Vasut <marex at denx.de> Cc: Peter Robinson <pbrobinson at gmail.com> Cc: Stefano Babic <sbabic at denx.de>
* | | defconfig: Move CONFIG_SPI_FLASH_BAR from configsJagan Teki2015-07-01-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves: - CONFIG_SPI_FLASH_BAR from include/configs/*.h into configs/*_defconfigs Signed-off-by: Jagan Teki <jteki@openedev.com>
* | | sf: dataflash: Rename to CONFIG_SPI_FLASH_DATAFLASHJagan Teki2015-07-01-1/+1
| | | | | | | | | | | | | | | | | | | | | Rename CONFIG_SF_DATAFLASH into CONFIG_SPI_FLASH_DATAFLASH as it follows the naming convention same as remaining configs. Signed-off-by: Jagan Teki <jteki@openedev.com>
* | | spi/sf: Minor cleanupsJagan Teki2015-07-01-5/+7
| | | | | | | | | | | | | | | | | | | | | - Adjust tab spaces - Add comments Signed-off-by: Jagan Teki <jteki@openedev.com>
* | | mtd, nand: Move common functions from cmd_nand.c to common placeHeiko Schocher2015-06-30-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move common functions from cmd_nand.c (for calculating offset and size from cmdline paramter) to common place, so they could used from other commands which use mtd partitions. For onenand the arg_off_size() is left in common/cmd_onenand.c. It should use now the common arg_off() function, but as I could not test onenand I let it there ... Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Jagannadh Teki <jteki@openedev.com>
* | | arm: ls102xa: Enable Driver Model SPI for ls1021atwrHaikun Wang2015-06-30-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Driver Model SPI for ls1021atwr board. DSPI and QSPI only be enabled when boot from QSPI. DSPI and QSPI are compatible under Driver Model SPI. Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com> Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Tested-by: Haikun Wang <haikun.wang@freescale.com> Reviewed-by: Prabhakar Kushwaha <prabhakar@freescale.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* | | arm: ls102xa: Enable Driver Model SPI for ls1021aqdsHaikun Wang2015-06-30-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Driver Model SPI for ls1021aqds board. DSPI and QSPI is enabled only when boot from QSPI. DSPI and QSPI are compatible under Driver Model SPI. Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com> Tested-by: Haikun Wang <haikun.wang@freescale.com> Reviewed-by: Jagan Teki <jteki@openedev.com>
* | | Merge git://git.denx.de/u-boot-marvellTom Rini2015-06-28-0/+7
|\ \ \
| * | | db-88f6820-gp.h: Load data blobs into lower memoryKevin Smith2015-06-28-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default on this platform, u-boot loads data into high memory in the range of 0x7Fxxxxxx, which generates a data abort when the kernel tries to read it. Config the u-boot environment to load the device tree and initrd image into lower memory to make them accessible to the kernel. Signed-off-by: Kevin Smith <kevin.smith@elecsyscorp.com> Acked-by: Stefan Roese <sr@denx.de>