summaryrefslogtreecommitdiff
path: root/include
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' of git://git.denx.de/u-boot-sunxiTom Rini2014-11-13-14/+56
|\
| * sun6i: ehci: Add sun6i ehci supportHans de Goede2014-11-13-0/+5
| | | | | | | | | | | | | | | | 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>
| * sunxi: ehci: Add proper Kconfig options to select the usb Vbus gpio-sHans de Goede2014-11-13-14/+0
| | | | | | | | | | | | | | | | | | 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>
| * sun6i: Add clock functions needed for SPL / DRAM initHans de Goede2014-11-13-0/+1
| | | | | | | | | | | | | | | | | | | | 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>
| * sun6i: Add basic axp221 driverOliver Schinagl2014-11-13-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2014-11-13-0/+2
|\ \
| * | km_arm: convert the km_arm boards to the generic board supportValentin Longchamp2014-11-12-0/+2
| |/ | | | | | | | | | | | | 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>
* | zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfigMichal Simek2014-11-13-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'zynq' of git://www.denx.de/git/u-boot-microblazeTom Rini2014-11-13-0/+31
|\ \
| * | configs: zynq: Add config support for ZYBOTinghui Wang2014-11-11-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | powerpc: remove orphaned boards mcc200 and prs200Nikita Kiryanov2014-11-12-398/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master' of git://git.denx.de/u-boot-socfpgaTom Rini2014-11-11-1/+137
|\ \ \
| * | | arm: socfpga: Add DT support for SoCFPGA and add socfpga_socrates targetStefan Roese2014-11-07-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | socfpga_cyclone5.h: fix kernel console argument in default environmentAnatolij Gustschin2014-11-07-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | arm: socfpga: Add example config entry for EPCS/EPCQ SPIMarek Vasut2014-10-31-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example config file entry for the Altera SPI controller. This SPI controller can also, under special conditions, be used to operate the EPCS/EPCQ SPI NOR. 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> Cc: Pavel Machek <pavel@denx.de> Cc: Stefan Roese <sr@denx.de> Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com>
| * | | arm: socfpga: Add I2C support to SoCFPGAStefan Roese2014-10-30-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds I2C support for the SoCFPGA. Using the designware I2C controller driver. It supports all 4 I2C busses on the SoCFPGA. The designware I2C driver has now been converted to the CONFIG_SYS_I2C framework. So lets enable it on SoCFPGA. Tested on SoCrates. 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: Pavel Machek <pavel@denx.de> Cc: Heiko Schocher <hs@denx.de>
* | | | Merge branch 'master' of git://git.denx.de/u-boot-usbTom Rini2014-11-11-1/+36
|\ \ \ \ | |_|_|/ |/| | |
| * | | usb: include <asm/cache.h> and <part.h> from include/usb.hMasahiro Yamada2014-11-07-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | arm: socfpga: Add example UDC configMarek Vasut2014-11-07-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | usb: s3c-otg: Allow custom gusbcfgMarek Vasut2014-11-07-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | usb: s3c-otg: Split out PHY controlMarek Vasut2014-11-07-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | ARM: UniPhier: call pin_init() also in the normal bootMasahiro Yamada2014-11-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | ARM: UniPhier: decrease pre-reloc malloc area sizeMasahiro Yamada2014-11-12-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | ARM: UniPhier: enable USB featuresMasahiro Yamada2014-11-12-0/+7
| | | | | | | | | | | | | | | | | | FAT-formated USB storage device access is available. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | ARM: UniPhier: move DDR related configuration to KconfigMasahiro Yamada2014-11-12-6/+0
| | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-blackfinTom Rini2014-11-10-0/+1
|\ \ \
| * | | bfin: the max bfin sdh block count is 127Sonic Zhang2014-11-10-0/+1
| |/ / | | | | | | | | | Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
* | | Merge branch 'master' of git://git.denx.de/u-boot-armTom Rini2014-11-10-0/+388
|\ \ \
| * | | arm: debug: replace license blocks with SPDXMasahiro Yamada2014-10-26-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
| * | | arm: debug: import debug files from Linux 3.16Masahiro Yamada2014-10-26-0/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | U-Boot does not have arch/arm/kernel, include/uapi directories, This commit copies files as follows: Location in Linux -> Location in U-Boot arch/arm/kernel/debug.S -> arch/arm/lib/debug.S arch/arm/include/debug/8250.S -> arch/arm/include/debug/8250.S include/uapi/linux/serial_reg.h -> include/linux/serial_reg.h Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
* | | | powerpc: o2dnt: convert to generic boardAnatolij Gustschin2014-11-07-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Anatolij Gustschin <agust@denx.de>
* | | | Merge git://git.denx.de/u-boot-tiTom Rini2014-11-07-50/+381
|\ \ \ \ | |_|/ / |/| | |
| * | | omap3: cm-t3517: add LCD/DVI and splash supportIgor Grinberg2014-11-06-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | omap3: cm-t3517: add Ethernet supportIgor Grinberg2014-11-06-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add both EMAC and SMC911x support. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Reviewed-by: Tom Rini <trini@ti.com>
| * | | omap3: cm-t3517: add USB supportIgor Grinberg2014-11-06-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | omap3: cm-t3517: add basic board supportIgor Grinberg2014-11-06-0/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | ks2_evm: config: enable fatload commandKhoronzhuk, Ivan2014-11-06-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | keystone2: config: align names of images with MCSDKKhoronzhuk, Ivan2014-11-06-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | keystone2: config: restructure handling of default env settingsMurali Karicheri2014-11-06-30/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently to customize env for various ks2 boards, individual variables such as NAME_FS etc are defined and included in the common config.h to define CONFIG_EXTRA_ENV_SETTINGS. This doesn't scale well if a variable is not applicable on a specific board. Using this scheme, we have to define variables with empty value and it's ugly. Instead, to allow board specific customization of default env variable, define a common CONFIG_EXTRA_ENV_KS2_SETTINGS for all common variables and define board specific variables in individual board specific config.h using CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS. Use the common and board specific variables to define CONFIG_EXTRA_ENV_SETTINGS. This way more variables can be added in future for individual boards without affecting the other config.h files. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * | | keystone2: change default boot mode to ubiMurali Karicheri2014-11-06-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow out of box demo, change default boot mode to ubi boot now that NAND is functional in latest EVMs. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * | | ks2_evm: configs: fix UBI volume nameKhoronzhuk, Ivan2014-11-06-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The UBI volume name has to be prefixed with "ubi:". Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * | | ARM: TI: omap3: remove raw initrd support in omap3_igep00x0 config file ↵Guillaume GARDET2014-11-06-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it is now in ti_armv7_common.h Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * | | ARM: TI: Enable raw initrd supportGuillaume GARDET2014-11-06-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
| * | | board: k2l_evm: add network supportHao Zhang2014-11-05-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds network support code and enables keystone_net driver usage for k2l_evm evaluation board. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Hao Zhang <hzhang@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * | | net: keystone_serdes: add keystone K2L SoC supportKhoronzhuk, Ivan2014-11-05-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keystone2 Lamar SoC uses the same keystone SerDes driver. All Keystone2 EVM boards currently use SerDes driver, so move CONFIG_TI_KEYSTONE_SERDES to common configuration file. Acked-by: Murali Karicheri <m-karicheri2@ti.com> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
| * | | Enable Android Fastboot support on am335x_evm boardDileep Katta2014-11-05-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dileep Katta <dileep.katta@linaro.org> [trini: Rework so that am335x_evm_usbspl still builds] Signed-off-by: Tom Rini <trini@ti.com>
| * | | twl4030: More voltages on VAUX2 and VAUX3Paul Kocialkowski2014-11-05-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* | | | Merge branch 'rmobile' of git://www.denx.de/git/u-boot-shTom Rini2014-11-05-4/+43
|\ \ \ \
| * | | | arm: rmobile: alt: Add VFAT filesystem supportNobuhiro Iwamatsu2014-11-04-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
| * | | | arm: rmobile: alt: Add support USB and USB commandsNobuhiro Iwamatsu2014-11-04-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for USB commands and USB storage device. Signed-off-by: Yoshiyuki Ito <yoshiyuki.ito.ub@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>