summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2014-11-13Merge branch 'master' of git://git.denx.de/u-boot-sunxiTom Rini
2014-11-13imx6: add spl in the header fileJohn Tobias
add the spl info in the header file. Also, added a macro statement in m6sabre_common.h to avoid compiler warning. Signed-off-by: John Tobias <john.tobias.ph@gmail.com>
2014-11-13imx: mx6q/dlsabreauto: And NAND flash supportYe.Li
The i.MX6Q/DL sabreauto board has one NAND socket, set the CONFIG_NAND_MXS and relevant NAND configurations to enable the MXS NAND flash driver. Add board level codes to set IOMUX and clock for GPMI-NAND and BCH module. Signed-off-by: Ye.Li <B37916@freescale.com> Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
2014-11-13imx: mx6q/dl sabre_common: Move MMC ENV offset to 512KB positionYe.Li
Set the CONFIG_ENV_OFFSET from 384KB to 512KB offset, so we will have larger space for u-boot image. When enabling NAND flash support feature, the u-boot image size has exceeded the 384KB, which causes overlay to the environment variables storage. Signed-off-by: Ye.Li <B37916@freescale.com> Acked-by: Fabio Estevam <fabio.estevam@freescale.com>
2014-11-13mx53loco: Change 'fdt_file' dynamicallyFabio Estevam
Since kernel 3.15 there are two dtb's for the imx53-qsb board: imx53-qsb.dtb - For the boards with DA9053 PMIC imx53-qsrb.dtb - For the boards with MC34708 PMIC Change the 'fdt_file' dynamically, so that the correct dtb can be used depending on the board variant. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
2014-11-13ot1200: add support for EHCIChristian Gmeiner
U-Boot 2014.10-17457-g0b23780-dirty (Nov 10 2014 - 11:41:04) CPU: Freescale i.MX6D rev1.2 at 792 MHz Reset cause: WDOG Board: ot1200 I2C: ready DRAM: 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 SF: Detected M25P16 with page size 256 Bytes, erase size 64 KiB, total 2 MiB In: serial Out: serial Err: serial Net: using phy at 0 FEC [PRIME] Hit any key to stop autoboot: 0 => usb start (Re)start USB... USB0: Port not available. USB1: USB EHCI 1.00 scanning bus 1 for devices... 4 USB Device(s) found => usb tree USB device tree: 1 Hub (480 Mb/s, 0mA) | u-boot EHCI Host Controller | +-2 Hub (480 Mb/s, 2mA) | +-3 Mass Storage (480 Mb/s, 80mA) | USBest Technology USB Mass Storage Device 0000000000028B | +-4 Vendor specific (480 Mb/s, 2mA) => Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
2014-11-13Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini
2014-11-13sun6i: ehci: Add sun6i ehci supportHans de Goede
Add support for the 2 ehci controllers found on the sun6i (A31) soc. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Marek Vasut <marex@denx.de>
2014-11-13sunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-sHans de Goede
Add proper Kconfig options to select the usb Vbus gpio-s, besides moving to Kconfig being the right thing to do, an added advantage of this is that it allows for boards without Vbus gpio-s. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
2014-11-13sun6i: Add clock functions needed for SPL / DRAM initHans de Goede
Add clock_init_safe and clockset_pll5 functions, as these are needed for SPL support resp. DRAM init (which is needed for SPL too). Also add some extra clock register constant defines. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
2014-11-13sun6i: Add basic axp221 driverOliver Schinagl
The A31 uses the AXP221 pmic for various voltages. Signed-off-by: Oliver Schinagl <oliver@schinagl.nl> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> -- Changes in v2: -Rebase Changes in v3: -Add support for all dldo and aldo-s -Add Kconfig option to select building AXP221 and to select voltage of dldo and aldo-s Changes in v4: -Add axp221_setbits helper function -Use symbolic names for enabled bits in CTRL1 - CTRL3 registers
2014-11-13zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfigMichal Simek
This is a MIME GnuPG-signed message. If you see this text, it means that your E-mail or Usenet software does not support MIME signed messages. The Internet standard for MIME PGP messages, RFC 2015, was published in 1996. To open this message correctly you will need to install E-mail or Usenet software that supports modern Internet standards. Move CONFIG_DEFAULT_DEVICE_TREE from board config directly to defconfig. This patch removes compilation warning: include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default] #define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-11-13Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblazeTom Rini
2014-11-13sh: move CONFIG_{SH2, SH2A, SH3, SH4} to KconfigMasahiro Yamada
This commit moves CONFIG_SH2, CONFIG_SH2A, CONFIG_SH3, CONFIG_SH4 to Kconfig renaming into CONFIG_CPU_SH2, CONFIG_CPU_SH2A, CONFIG_CPU_SH3, CONFIG_CPU_SH4, respectively because arch/sh/Kconfig of Linux uses CONFIG_CPU_SH* convention. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-12powerpc: remove orphaned boards mcc200 and prs200Nikita Kiryanov
mcc200 and prs200 are old and have no maintainer. Remove the boards. This also removes the mcc200 specific 1bpp BMP support from common/lcd.c Cc: Wolfgang Denk <wd@denx.de> Cc: Anatolij Gustschin <agust@denx.de> Cc: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: York Sun <yorksun@freescale.com> Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
2014-11-12km_arm: convert the km_arm boards to the generic board supportValentin Longchamp
This implies that all the km_kirkwood boards and their variants now are using the generic board init sequence. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
2014-11-11Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini
2014-11-11Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini
2014-11-12ARM: UniPhier: call pin_init() also in the normal bootMasahiro Yamada
CONFIG_UNIPHIER_SERIAL has been moved to Kconfig and it is defined in ./.config but not in spl/.config, so pin_init() should be called from the normal image so that UART works correctly. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-12ARM: UniPhier: decrease pre-reloc malloc area sizeMasahiro Yamada
In the current implementation of the boot sequence of UniPhier platform, 32KB temporary RAM is available before relocation. The malloc area and the stack shares the 32KB area. With CONFIG_SYS_MALLOC_F_LEN set to 0x7000 (28KB), only 0x1000 (4KB) is left for the stack. In some use cases, the system hangs up with stack over-flow. Even with driver-model UART enabled, the malloc area of 0x2000 (8KB) should be enough. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-12ARM: UniPhier: enable USB featuresMasahiro Yamada
FAT-formated USB storage device access is available. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-12ARM: UniPhier: move DDR related configuration to KconfigMasahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-11configs: zynq: Add config support for ZYBOTinghui Wang
This patch adds config support needed for ZYBO target and has been tested on Rev. B ZYBO hardware. Signed-off-by: Tinghui Wang <steven.wang@digilentinc.com> [PC changes: * Dropped boards.cfg change (rebase conflict) * Dropped custom u-boot env * Added DTS * Misc forward-porting changes ] Signed-off-by: Peter Crosthwiate <crosthwaite.peter@gmail.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
2014-11-10Merge branch 'master' of git://git.denx.de/u-boot-blackfinTom Rini
2014-11-10Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini
2014-11-10arm: rmobile: alt: Change clock of SCIF to external clockNobuhiro Iwamatsu
Change clock of SCIF for Alt board is used to external clock. This changes to using external clock. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10bfin: the max bfin sdh block count is 127Sonic Zhang
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
2014-11-10arm: rmobile: Move rcar-i2c of the address defined to common headerNobuhiro Iwamatsu
R-Car SoCs of rmobile have same IP of rcar-i2c, and have same address. This moves rcar-i2c of the address defined to rcar-base.h as common header of R-Car SoCs. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Move sh-i2c of the address defined to common headerNobuhiro Iwamatsu
R-Car SoCs of rmobile have same IP of sh-i2c, and have same address. This moves sh-i2c of the address defined to rcar-base.h as common header of R-Car SoCs, and headers of each SoCs. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: alt: Remove board_late_init functionNobuhiro Iwamatsu
Alt board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: lager: Remove board_late_init functionNobuhiro Iwamatsu
Lager board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: koelsch: Remove board_late_init functionNobuhiro Iwamatsu
Koelsch board does not use board_late_init function. This removes this function and define of BOARD_LATE_INIT from config. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add VFAT file system supportNobuhiro Iwamatsu
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add USB supportNobuhiro Iwamatsu
Gose board has two USB ports, and can use USB EHCI HCD driver of rmobile. This adds driver settings in order to use this driver. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: gose: Add Ethernet supportNobuhiro Iwamatsu
Gose board has one ether port, this works using sh-ether driver. This adds GPIO settings and driver settings in order to use the sh-ether. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-10arm: rmobile: Add support gose boardNobuhiro Iwamatsu
The gose board has R8A7793, 1GB DDR3-SDRAM, USB, Ethernet, and more. This patch supports the following functions: - DDR3-SDRAM - SCIF - QSPI - SPI Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> CC: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
2014-11-07powerpc: o2dnt: convert to generic boardAnatolij Gustschin
Signed-off-by: Anatolij Gustschin <agust@denx.de>
2014-11-07Merge git://git.denx.de/u-boot-tiTom Rini
2014-11-07usb: include <asm/cache.h> and <part.h> from include/usb.hMasahiro Yamada
The header file include/usb.h references ARCH_DMA_MINALIGH and block_dev_desc_t, thus it must include <asm/cache.h> and <part.h>. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
2014-11-07arm: socfpga: Add example UDC configMarek Vasut
Add example of an USB UDC configuration with DFU and UMS. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Vince Bridgers <vbridger@altera.com> Acked-by: Pavel Machek <pavel@denx.de> Cc: Stefan Roese <sr@denx.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
2014-11-07usb: s3c-otg: Allow custom gusbcfgMarek Vasut
Allow passing in a custom configuration of the gusbcfg register via platform data. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Vince Bridgers <vbridger@altera.com> Acked-by: Pavel Machek <pavel@denx.de> Cc: Stefan Roese <sr@denx.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
2014-11-07usb: s3c-otg: Split out PHY controlMarek Vasut
Split the Samsung specific PHY control into a separate file and compile this into the S3C OTG driver only if used on a Samsung system. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Vince Bridgers <vbridger@altera.com> Acked-by: Pavel Machek <pavel@denx.de> Cc: Stefan Roese <sr@denx.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com> Tested-by: Lukasz Majewski <l.majewski@samsung.com>
2014-11-07arm: socfpga: Add DT support for SoCFPGA and add socfpga_socrates targetStefan Roese
This patch includes the latest DT sources for socfpga from the current Linux kernel. And enables CONFIG_OF_CONTROL for the new build target "socfpga_socrates" (the EBV SoCrates board) to make use of this new DT support. Until this patch, the only SoCFPGA U-Boot target in mainline is "socfpga_cyclone5". This build target is not (yet) changed to support DT. So nothing changes for this target. Even though the long-term goal should be to move all SoCFPGA targets over to DT. One of the reasons to enable DT support in SoCFPGA is, that I need to support multiple different SPI controllers for this platform. This is the QSPI Cadence controller and the Designware SPI master controller. Both are implemented in the SoCFPGA. And enabling both controllers is only possible by using the new driver model (DM). The DM SPI code only supports DT based probing. So it was easier to move SoCFPGA to DT than to add the (deprecated) platform-data based probing to the DM SPI suport. Note that the image with the dtb embedded is u-boot-dtb.img. This needs to be used now for those DT enabled boards instead of u-boot.img. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Marek Vasut <marex@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@altera.com> Cc: Vince Bridgers <vbridger@altera.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Pavel Machek <pavel@denx.de> Cc: Simon Glass <sjg@chromium.org>
2014-11-07socfpga_cyclone5.h: fix kernel console argument in default environmentAnatolij Gustschin
With fresh environment the kernel gets wrong console argument and boots without console output. Fix it. Reported-by: Dinh Nguyen <dinguyen@opensource.altera.com> Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Chin Liang See <clsee@altera.com> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Marek Vasut <marex@denx.de>
2014-11-06omap3: cm-t3517: add LCD/DVI and splash supportIgor Grinberg
Add support for splash screen on both DVI and SCF0403 LCD. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
2014-11-06omap3: cm-t3517: add Ethernet supportIgor Grinberg
Add both EMAC and SMC911x support. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
2014-11-06omap3: cm-t3517: add USB supportIgor Grinberg
Add both host and mUSB support. Currently, the selection between host USB and mUSB is done through the config file. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
2014-11-06omap3: cm-t3517: add basic board supportIgor Grinberg
CompuLab cm-t3517 is Computer on Module (CoM) based on AM3517 SoC. Features: up to 256MB DDR2, up to 512MB NAND, USB hub, mUSB, WiFi, BT, Analog audio codec, touch screen controller, LED. Add basic support including: LED, Serial console, NAND, MMC, GPIO, I2C, 256MB DRAM. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
2014-11-06ks2_evm: config: enable fatload commandKhoronzhuk, Ivan
The keystone2 evm can boot from USB partition with FAT32 FS, so enable generic load command and fatload command usage. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
2014-11-06keystone2: config: align names of images with MCSDKKhoronzhuk, Ivan
The Multicore Software Development Kit (MCSDK) provides foundational software for TI KeyStone II device platforms. It's supposed to be used with uboot, and it's convenient to have the same names for images, so correct environment image names according to the last MCSDK3. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>